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

diff --combined builtin/am.c
index 3dfe70b7a039afadf2de4dfe8f809e3321287004,1411e3a3b426ae5e7a55afd48d8d21488682dc7a..0d97f2fabb0fe528fcbb82b32146b09a5265f5f6
--- 1/builtin/am.c
--- 2/builtin/am.c
+++ b/builtin/am.c
@@@ -769,15 -769,15 +769,15 @@@ static int split_mail_conv(mail_conv_f
                        in = fopen(*paths, "r");
  
                if (!in)
 -                      return error(_("could not open '%s' for reading: %s"),
 -                                      *paths, strerror(errno));
 +                      return error_errno(_("could not open '%s' for reading"),
 +                                         *paths);
  
                mail = mkpath("%s/%0*d", state->dir, state->prec, i + 1);
  
                out = fopen(mail, "w");
                if (!out)
 -                      return error(_("could not open '%s' for writing: %s"),
 -                                      mail, strerror(errno));
 +                      return error_errno(_("could not open '%s' for writing"),
 +                                         mail);
  
                ret = fn(out, in, keep_cr);
  
@@@ -857,7 -857,8 +857,7 @@@ static int split_mail_stgit_series(stru
  
        fp = fopen(*paths, "r");
        if (!fp)
 -              return error(_("could not open '%s' for reading: %s"), *paths,
 -                              strerror(errno));
 +              return error_errno(_("could not open '%s' for reading"), *paths);
  
        while (!strbuf_getline_lf(&sb, fp)) {
                if (*sb.buf == '#')
@@@ -1578,14 -1579,14 +1578,14 @@@ static int build_fake_ancestor(const st
  }
  
  /**
-  * Do the three-way merge using fake ancestor, his tree constructed
+  * Do the three-way merge using fake ancestor, their tree constructed
   * from the fake ancestor and the postimage of the patch, and our
   * state.
   */
  static int run_fallback_merge_recursive(const struct am_state *state,
                                        unsigned char *orig_tree,
                                        unsigned char *our_tree,
-                                       unsigned char *his_tree)
+                                       unsigned char *their_tree)
  {
        struct child_process cp = CHILD_PROCESS_INIT;
        int status;
@@@ -1593,7 -1594,7 +1593,7 @@@
        cp.git_cmd = 1;
  
        argv_array_pushf(&cp.env_array, "GITHEAD_%s=%.*s",
-                        sha1_to_hex(his_tree), linelen(state->msg), state->msg);
+                        sha1_to_hex(their_tree), linelen(state->msg), state->msg);
        if (state->quiet)
                argv_array_push(&cp.env_array, "GIT_MERGE_VERBOSITY=0");
  
@@@ -1601,7 -1602,7 +1601,7 @@@
        argv_array_push(&cp.args, sha1_to_hex(orig_tree));
        argv_array_push(&cp.args, "--");
        argv_array_push(&cp.args, sha1_to_hex(our_tree));
-       argv_array_push(&cp.args, sha1_to_hex(his_tree));
+       argv_array_push(&cp.args, sha1_to_hex(their_tree));
  
        status = run_command(&cp) ? (-1) : 0;
        discard_cache();
@@@ -1614,7 -1615,7 +1614,7 @@@
   */
  static int fall_back_threeway(const struct am_state *state, const char *index_path)
  {
-       unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],
+       unsigned char orig_tree[GIT_SHA1_RAWSZ], their_tree[GIT_SHA1_RAWSZ],
                      our_tree[GIT_SHA1_RAWSZ];
  
        if (get_sha1("HEAD", our_tree) < 0)
@@@ -1651,7 -1652,7 +1651,7 @@@
                return error(_("Did you hand edit your patch?\n"
                                "It does not apply to blobs recorded in its index."));
  
-       if (write_index_as_tree(his_tree, &the_index, index_path, 0, NULL))
+       if (write_index_as_tree(their_tree, &the_index, index_path, 0, NULL))
                return error("could not write tree");
  
        say(state, stdout, _("Falling back to patching base and 3-way merge..."));
@@@ -1661,13 -1662,13 +1661,13 @@@
  
        /*
         * This is not so wrong. Depending on which base we picked, orig_tree
-        * may be wildly different from ours, but his_tree has the same set of
+        * may be wildly different from ours, but their_tree has the same set of
         * wildly different changes in parts the patch did not touch, so
         * recursive ends up canceling them, saying that we reverted all those
         * changes.
         */
  
-       if (run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {
+       if (run_fallback_merge_recursive(state, orig_tree, our_tree, their_tree)) {
                rerere(state->allow_rerere_autoupdate);
                return error(_("Failed to merge in the changes."));
        }