From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: Question on rerere
Date: Tue, 19 Dec 2006 16:41:33 -0800 [thread overview]
Message-ID: <7vk60no0ua.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0612200045490.19693@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Wed, 20 Dec 2006 00:53:38 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> IIUC then each conflict hunk is handled _separately_ like this: the
> lexicographically smaller between the two file sections is displayed
> first, regardless if a previous hunk had a different order. Not that it
> matters most of the time, but isn't this dangerous?
You are probably right. Probably the right thing would be to
use the first hunk to determine the flipping order and stick to
that for the rest.
Not that I've seen problems with the current behaviour, though.
next prev parent reply other threads:[~2006-12-20 0:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-19 23:53 Question on rerere Johannes Schindelin
2006-12-20 0:41 ` Junio C Hamano [this message]
2006-12-20 1:29 ` Junio C Hamano
2006-12-20 1:40 ` Johannes Schindelin
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=7vk60no0ua.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox