]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04f3d4b e933675)
Merge commit 'e93367512080e540dc5dd126dfcb38b4a5e9415b' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:18:12 +0000 (04:18 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Thu, 23 Jun 2016 01:18:12 +0000 (04:18 +0300)
1  2 
packages/diff-hl/README.md patch | diff1 | diff2 | blob | history
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/README.md
Simple merge
diff --cc packages/diff-hl/diff-hl-flydiff.el
Simple merge
diff --cc packages/diff-hl/diff-hl.el
Simple merge