all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* svn and smerge-mode
@ 2008-08-26  9:23 Nick Roberts
  2008-08-26 13:46 ` Stefan Monnier
  2008-08-27  2:37 ` Miles Bader
  0 siblings, 2 replies; 7+ messages in thread
From: Nick Roberts @ 2008-08-26  9:23 UTC (permalink / raw)
  To: emacs-devel


With Emacs 23.0.60, visiting a file with conflicts under SVN control puts it
into smerge-mode.  I think this is too prescriptive.  On the few occasions that
I need to resolve conflicts I do it by hand and I've lost information trying to
use smerge-mode.  If someone wants smerge-mode they can easily turn it on.

-- 
Nick                                           http://www.inet.net.nz/~nickrob




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-08-27 17:47 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-26  9:23 svn and smerge-mode Nick Roberts
2008-08-26 13:46 ` Stefan Monnier
2008-08-27  8:43   ` Nick Roberts
2008-08-27 17:47     ` Stefan Monnier
2008-08-27  2:37 ` Miles Bader
2008-08-27  8:47   ` Nick Roberts
2008-08-27  9:36     ` Miles Bader

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.