Thread (1 message) 1 message, 1 author, 2016-08-11

Re: Question on rerere

From: Junio C Hamano <hidden>
Date: 2016-08-11 19:29:28

Johannes Schindelin [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help