From: Junio C Hamano <junkio@cox.net>
Date: Thu, 09 Feb 2006 20:52:13 GMT
Subject: Re: gitweb using "--cc"?
Message-ID: <7v4q389rwi.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7v8xsk9s3v.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

> So obviously it would show the final paths and would not talk
> about which different path from each parent contributed to the
> result, but otherwise it should not be broken too much.  At
> least that was the way I intended..

Sorry, I am wrong again.  That was the way how I planned to, but
I think I forgot to pass the diff-options from the caller to
diff_tree_combined_merge(), so it does not do renames/copies.

Shouldn't be too hard to change it though...