]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4834a3f 3f49d2b)
Merge commit '3f49d2b3934e69d11410d08f1be8e0011237c11c' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 10 Aug 2014 16:32:38 +0000 (20:32 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 10 Aug 2014 16:32:38 +0000 (20:32 +0400)
1  2 
packages/diff-hl/README.md patch | diff1 | diff2 | blob | history
packages/diff-hl/diff-hl-margin.el patch | diff1 | diff2 | blob | history
packages/diff-hl/diff-hl.el patch | diff1 | diff2 | blob | history

diff --cc packages/diff-hl/README.md
Simple merge
diff --cc packages/diff-hl/diff-hl-margin.el
Simple merge
diff --cc packages/diff-hl/diff-hl.el
Simple merge