Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH] merge-recursive: do not report the resulting tree object name

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:49

Possibly related (same subject, not in this thread)

Hi,

I like this patch. merge-recursive is very talkative, to the intimidating 
astonishment of unsuspecting users.

The real information is in the conflict markers now, which tell the user 
where what hunk came from. And the names in the markers are _really_ 
useful now.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help