[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: patch for smerge buglet

From: David Kastrup
Subject: Re: patch for smerge buglet
Date: Mon, 05 May 2008 13:11:35 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux)

Stefan Monnier <address@hidden> writes:

>> 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?

David Kastrup, Kriemhildstr. 15, 44793 Bochum

reply via email to

[Prev in Thread] Current Thread [Next in Thread]