From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2016 20:22:23 +0000 (-0700)
Subject: Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'
X-Git-Tag: v2.10.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d55eea805c5451afd0a56a4f5aa045ba63083f9;p=thirdparty%2Fgit.git

Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'

One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".

* js/am-call-theirs-theirs-in-fallback-3way:
  am: counteract gender bias
---

3d55eea805c5451afd0a56a4f5aa045ba63083f9