Re: [PATCH] merge: teach -Xours/-Xtheirs to symbolic link merge

From: Elijah Newren <newren@gmail.com>
Date: Dec 29, 2017, 02:49 UTC
Message-ID: <CABPp-BHTZrNonnJrWfZg+_xCrO+o_uNjx4nbwuVHF4qVGe01cA@mail.gmail.com>
In-Reply-To: <xmqqtvyzslcz.fsf_-_@gitster.mtv.corp.google.com>

On Sun, Oct 15, 2017 at 10:38 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

> The -Xours/-Xtheirs merge options were originally defined as a way
> to "force" the resolution of 3way textual merge conflicts to take
> one side without using your editor, hence did not even trigger in
> situations where you would normally not get the <<< === >>> conflict
> markers.
>
> This was improved for binary files back in 2012 with a944af1d
> ("merge: teach -Xours/-Xtheirs to binary ll-merge driver",
> 2012-09-08).
>
> Teach a similar trick to the codepath that deals with merging two
> conflicting changes to symbolic links.

Saw this change referenced in the "what's cooking" emails and decided to review this. The code changes look obviously correct to me, and the testcase looks good too.

Reviewed-by: Elijah Newren <newren@gmail.com>

(and perhaps we should also add in "Tested-by: Yaroslav Halchenko <yoh@onerussian.com>" ? At least, that was my thought based on https://public-inbox.org/git/20170926133703.7gtk5ztkhqvfxszh@hopa.kiewit.dartmouth.edu/ )