[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: PCL-CVS and smerge mode
From: |
Stefan Monnier |
Subject: |
Re: PCL-CVS and smerge mode |
Date: |
Wed, 09 Jan 2002 13:22:04 -0500 |
> Sometimes, when PCL-CVS shows me that there is a conflict, hitting
> `f' on the file enters smerge-mode. Sometimes, smerge-mode is not
> invoked.
>
> What should I start looking for to see a pattern?
I can't quite remember, but I think that smerge-mode is never entered
when you press `f'. Instead it's entered when the buffer is reverted,
so it might simply depend on whether or not the file was already
loaded into a buffer.
There's a TODO entry in pcvs.el about making `f' call smerge-mode when
the file has a CONFLICT. Patches are welcome,
Stefan