]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cde5d9a 7fa7f09)
Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 9 Sep 2015 18:58:50 +0000 (21:58 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 9 Sep 2015 18:58:50 +0000 (21:58 +0300)
1  2 
packages/diff-hl/README.md patch | diff1 | diff2 | blob | history
packages/diff-hl/diff-hl-dired.el patch | diff1 | diff2 | blob | history
packages/diff-hl/diff-hl-flydiff.el patch | | 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-dired.el
Simple merge
diff --cc packages/diff-hl/diff-hl-flydiff.el
index 0000000000000000000000000000000000000000,53d31f7496655102ea608164adf28f096470104a..53d31f7496655102ea608164adf28f096470104a
mode 000000,100644..100644
--- /dev/null
--- 2/diff-hl-flydiff.el
+++ b/packages/diff-hl/diff-hl-flydiff.el
diff --cc packages/diff-hl/diff-hl-margin.el
Simple merge
diff --cc packages/diff-hl/diff-hl.el
Simple merge