mergetool: Add a test for running mergetool in a sub-directory

diff --git a/git.c b/git.c
index ee331aabc66e75dc8c79293be5bcb4bd000cb73d..ecc8fad09aebd16410f2736458d60e04f9dfb296 100644 (file)
--- a/git.c
+++ b/git.c
@@ -158,7 +158,7 @@ static int handle_alias(int *argcp, const char ***argv)
                        if (ret >= 0 && WIFEXITED(ret) &&
                            WEXITSTATUS(ret) != 127)
                                exit(WEXITSTATUS(ret));
-                       die("Failed to run '%s' when expanding alias '%s'\n",
+                       die("Failed to run '%s' when expanding alias '%s'",
                            alias_string + 1, alias_command);
                }
                count = split_cmdline(alias_string, &new_argv);