| commit | 2cc441ecbf093d2d7e319f2359b80fd358589b0f | |
| author | Eric S. Raymond <esr@thyrsus.com> | |
| Wed, 13 Aug 2014 08:05:45 +0000 (13 04:05 -0400) | ||
| committer | Eric S. Raymond <esr@thyrsus.com> | |
| Wed, 13 Aug 2014 08:05:45 +0000 (13 04:05 -0400) | ||
| tree | b12c3085c43277ebb92f5e92ee91d110527335e0 | treesnapshot (tar.gz zip) |
| parent | c1677234a35ac49ac1dd4276a19e90ac8e62b6e6 | commitdiff |
Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/vc/vc-git.el | diffblobblamehistory |