(smerge-refine): Also work on "same change conflicts".
commit30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 15 Jan 2008 21:40:09 +0000 (15 21:40 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 15 Jan 2008 21:40:09 +0000 (15 21:40 +0000)
tree72aab8063990bea84c0b215c61011b3f3a0c2831
parent2507310c84e569a0dcb981d497b8a067dfaffccd
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
lisp/ChangeLog
lisp/smerge-mode.el