From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 12 Jan 2007 23:36:09 GMT
Subject: Re: [PATCH] merge-recursive: do not report the resulting tree object name
Message-ID: <Pine.LNX.4.63.0701130034000.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v8xg8t3aj.fsf_-_@assigned-by-dhcp.cox.net>

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