summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6494957)
looking at conflict marker.
+2008-05-05 Tom Tromey <tromey@redhat.com>
+
+ * smerge-mode.el (smerge-start-session): Don't call smerge-next if
+ looking at conflict marker.
+
2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
If no conflict maker is found, turn off `smerge-mode'."
(smerge-mode 1)
(condition-case nil
If no conflict maker is found, turn off `smerge-mode'."
(smerge-mode 1)
(condition-case nil
+ (unless (looking-at smerge-begin-re)
+ (smerge-next))
(error (smerge-auto-leave))))
(provide 'smerge-mode)
(error (smerge-auto-leave))))
(provide 'smerge-mode)