| commit | 30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Tue, 15 Jan 2008 21:40:09 +0000 (15 21:40 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Tue, 15 Jan 2008 21:40:09 +0000 (15 21:40 +0000) | ||
| tree | 72aab8063990bea84c0b215c61011b3f3a0c2831 | treesnapshot (tar.gz zip) |
| parent | 2507310c84e569a0dcb981d497b8a067dfaffccd | commitdiff |
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
(smerge-makeup-conflict): New command.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |