From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Sep 2017 01:08:18 GMT
Subject: Re: BUG: merge -s theirs is not in effect (does the same as -s ours)
Message-ID: <xmqqwp4nfuv1.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170925000213.rilmsczdbi3jqkta@hopa.kiewit.dartmouth.edu>

Yaroslav Halchenko <yoh@onerussian.com> writes:

> My interest was to get remote branch "merge" the changes in the
> branch taking the branch's version (primarily alternative symlinks
> for git-annex'ed content) over the version in master (previous
> merge of a similar branch).  Unfortunately -s theirs seems to do
> actually -s ours

What does

    ls $(git --exec-path) | grep git-merge

say?  

The official Git never shipped "git-merge-theirs" as far as I know,
and it should not exist (neither should "git merge -s theirs"; you
can use "git reset --hard theirs" instead).