From: Junio C Hamano Date: Thu, 28 Jul 2016 18:25:59 +0000 (-0700) Subject: Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint X-Git-Tag: v2.9.3~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=174f9e622fde6c874ba3d53eb05d0f37d6001ba5;p=thirdparty%2Fgit.git Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint 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 --- 174f9e622fde6c874ba3d53eb05d0f37d6001ba5