       type: 'boolean'
       default: true
       description: 'Should word diffs be highlighted in diffs?'
+    syntaxHighlighting:
+      title: 'Enable syntax highlighting in diffs?'
+      type: 'boolean'
+      default: true
     numberOfCommitsToShow:
       type: 'integer'
       default: 25

    @subscriptions.add atom.commands.add 'atom-workspace', 'git-plus:merge-remote', -> git.getRepo().then((repo) -> GitMerge(repo, remote: true))
    @subscriptions.add atom.commands.add 'atom-workspace', 'git-plus:rebase', -> git.getRepo().then((repo) -> GitRebase(repo))
    @subscriptions.add atom.commands.add 'atom-workspace', 'git-plus:git-open-changed-files', -> git.getRepo().then((repo) -> GitOpenChangedFiles(repo))

  deactivate: ->
    @subscriptions.dispose()

GitOpenChangedFiles    = require './models/git-open-changed-files'
diffGrammar            = require './grammars/diff.js'

baseGrammar = __dirname + '/grammars/diff.json'

currentFile = (repo) ->
  repo.relativize(atom.workspace.getActiveTextEditor()?.getPath())
