| commit | 8653eee82efbe2b3b14f671f3f991c356c2a5065 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 5 May 2008 06:16:20 +0000 (5 06:16 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 5 May 2008 06:16:20 +0000 (5 06:16 +0000) | ||
| tree | 2bb58e500e780ac9ced113d90818282b903e9162 | treesnapshot (tar.gz zip) |
| parent | 6494957aaac593338de005e914c9eed4faded1c1 | commitdiff |
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
looking at conflict marker.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |