In message <[EMAIL PROTECTED]>, Roy Smith wrote: > Likewise for the source control (CVS, SVN, P4, etc) integrations [in > emacs].
Discovered that by accident today. Had a conflicted update in Subversion, fixed it up, saved the file, switched to a terminal window, typed "svn status", and lo and behold, the conflict had vanished (along with the .mine and .rnn files). I assume it was Emacs doing that, and not a side-effect of the "svn status" command. :) -- http://mail.python.org/mailman/listinfo/python-list