branch: externals/diff-hl
commit a57ea441a8d3e3e5251fe4dc08b547d1ee52121c
Merge: ed47dc1812 114b5da2a9
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: GitHub <nore...@github.com>

    Merge pull request #237 from vifon/jj-diff-switches
    
    Provide diff switches for jj
---
 diff-hl.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diff-hl.el b/diff-hl.el
index 0f73c5883b..ceb28925f2 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -308,6 +308,7 @@ It can be a relative expression as well, such as \"HEAD^\" 
with Git, or
 
 (defvar vc-svn-diff-switches)
 (defvar vc-fossil-diff-switches)
+(defvar vc-jj-diff-switches)
 
 (defmacro diff-hl-with-diff-switches (body)
   `(let ((vc-git-diff-switches
@@ -323,6 +324,7 @@ It can be a relative expression as well, such as \"HEAD^\" 
with Git, or
          (vc-hg-diff-switches nil)
          (vc-svn-diff-switches nil)
          (vc-fossil-diff-switches '("-c" "0"))
+         (vc-jj-diff-switches '("--context=0"))
          (vc-diff-switches '("-U0"))
          ,@(when (boundp 'vc-disable-async-diff)
              '((vc-disable-async-diff t))))

Reply via email to