[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC needs a mechanism to turn on smerge-mode in case of conflics
From: |
Dan Nicolaescu |
Subject: |
Re: VC needs a mechanism to turn on smerge-mode in case of conflics |
Date: |
Mon, 14 Jan 2008 00:44:02 -0800 |
Stefan Monnier <address@hidden> writes:
> > 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.
I created a Todo section in vc.el and added this there.