]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c167723) | patch
Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git.
authorEric S. Raymond <esr@thyrsus.com>
Wed, 13 Aug 2014 08:05:45 +0000 (04:05 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 13 Aug 2014 08:05:45 +0000 (04:05 -0400)
commit2cc441ecbf093d2d7e319f2359b80fd358589b0f
treeb12c3085c43277ebb92f5e92ee91d110527335e0tree | snapshot
parentc1677234a35ac49ac1dd4276a19e90ac8e62b6e6commit | diff
Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-git.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.