From: Junio C Hamano <junkio@cox.net>
Date: Wed, 20 Dec 2006 00:41:33 GMT
Subject: Re: Question on rerere
Message-ID: <7vk60no0ua.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0612200045490.19693@wbgn013.biozentrum.uni-wuerzburg.de>

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.