merge-one-file: fix broken merges with alternate work trees

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 9f13caa76d3b147993b2cf39397d2f5761cfca22..35a709e63066ad8bebc8a96dee0563bad43348b6 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
                        return config_error_nonbool(var);
                /*
                 * default_arg is now passed to parse_options(), so we need to
-                * mimick the real argv a bit better.
+                * mimic the real argv a bit better.
                 */
                if (!default_num) {
                        default_alloc = 20;