]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9c9f55 6ea154f)
Merge commit '6ea154f73f8389abb03c804bb4a4d21c8893861b' from diff-hl
authorDmitry Gutov <dgutov@yandex.ru>
Fri, 2 Jan 2015 23:44:08 +0000 (01:44 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Fri, 2 Jan 2015 23:44:08 +0000 (01:44 +0200)
1  2 
packages/diff-hl/diff-hl-dired.el 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/diff-hl-dired.el
Simple merge
diff --cc packages/diff-hl/diff-hl-margin.el
Simple merge
diff --cc packages/diff-hl/diff-hl.el
Simple merge