Re: patch for smerge buglet

[Stefan Monnier]

>>> In a vc-dir buffer I used "f" to open a ChangeLog file that had a
>>> conflict.  As often happens with ChangeLog, the conflict was on the
>>> very first line of the file.  To my surprise, the file was visited
>>> with point at EOF.
>> 
>>> This patch to smerge-mode fixed the problem for me.
>> 
>> Thanks, installed,

> The git conflict markers are sometimes left in the file.  Do you use git
> yourself, or should I send an example when this happens the next time?

I don't know what you mean by "left in the file" or what it has to do
with smerge-mode.  If Git does not use the standard diff3 markers, then
it would be much more valuable to change Git than to adapt smerge-mode
to it.


        Stefan