From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jul 2011 18:43:25 GMT
Subject: Re: [PATCH 36/48] merge-recursive: Provide more info in conflict markers with file renames
Message-ID: <7vvcuv1nle.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1307518278-23814-37-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> Whenever there are merge conflicts in file contents, we would mark the
> different sides of the conflict with the two branches being merged.
> However, when there is a rename involved as well, the branchname is not
> sufficient to specify where the conflicting content came from.  In such
> cases, mark the two sides of the conflict with branchname:filename rather
> than just branchname.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>

Nice.