]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2507310) | patch
(smerge-refine): Also work on "same change conflicts".
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 15 Jan 2008 21:40:09 +0000 (21:40 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 15 Jan 2008 21:40:09 +0000 (21:40 +0000)
commit30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a
tree72aab8063990bea84c0b215c61011b3f3a0c2831tree | snapshot
parent2507310c84e569a0dcb981d497b8a067dfaffccdcommit | diff
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
lisp/ChangeLog diff | blob | history
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.