diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:59 -0700 |
| commit | 174f9e622fde6c874ba3d53eb05d0f37d6001ba5 (patch) | |
| tree | a35f4a0f84705f95b9679b7efa326740a79d74a6 /xdiff/xemit.c | |
| parent | 8a81d5f5f81c8e42927b4361bc93ddfc345393b7 (diff) | |
| parent | 715a51bcaf4f8625e99a972326bfce3fdace3071 (diff) | |
| download | git-174f9e622fde6c874ba3d53eb05d0f37d6001ba5.tar.gz git-174f9e622fde6c874ba3d53eb05d0f37d6001ba5.tar.xz | |
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
Diffstat (limited to 'xdiff/xemit.c')
0 files changed, 0 insertions, 0 deletions