]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f09f80 d0e6660)
Merge commit 'd0e6660ee501efea3e9b0936ed64fff09e66df02' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 10 Jan 2016 15:47:16 +0000 (18:47 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 10 Jan 2016 15:47:16 +0000 (18:47 +0300)
1  2 
packages/diff-hl/diff-hl-flydiff.el patch | diff1 | diff2 | blob | history
packages/diff-hl/diff-hl.el patch | diff1 | diff2 | blob | history

diff --cc packages/diff-hl/diff-hl-flydiff.el
Simple merge
diff --cc packages/diff-hl/diff-hl.el
Simple merge