all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: David Kastrup <dak@gnu.org>
Cc: tromey@redhat.com, emacs-devel@gnu.org
Subject: Re: patch for smerge buglet
Date: Mon, 05 May 2008 14:04:46 -0400	[thread overview]
Message-ID: <jwv63tsocgh.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <85y76patug.fsf@lola.goethe.zz> (David Kastrup's message of "Mon,  05 May 2008 13:11:35 +0200")

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




      reply	other threads:[~2008-05-05 18:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-05  0:08 patch for smerge buglet Tom Tromey
2008-05-05  6:16 ` Stefan Monnier
2008-05-05 11:11   ` David Kastrup
2008-05-05 18:04     ` Stefan Monnier [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwv63tsocgh.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=dak@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=tromey@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.