]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 6494957) | patch
(smerge-start-session): Don't call smerge-next if
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 5 May 2008 06:16:20 +0000 (06:16 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 5 May 2008 06:16:20 +0000 (06:16 +0000)
commit8653eee82efbe2b3b14f671f3f991c356c2a5065
tree2bb58e500e780ac9ced113d90818282b903e9162tree
parent6494957aaac593338de005e914c9eed4faded1c1commit | diff
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
lisp/ChangeLog diff | blob | history
lisp/smerge-mode.el diff | blob | history