Re: VC needs a mechanism to turn on smerge-mode in case of conflics

[Stefan Monnier]

> Currently smerge-mode gets turned on if emacs detects a conflict when
> doing a merge/update. But if the merge is done from the command line or
> some other tool, the version control system might know there's conflict.
> But VC does not turn on smerge-mode when doing C-x C-f on a file with
> conflicts.
> It would be nice if there was a way to do this.

Indeed.  It already does that in the Arch and SVN backends.


        Stefan