Merge branch 'da/mergetool-trust-exit-code'

diff --git a/builtin/pull.c b/builtin/pull.c
index 01b64654c5c017dd15dd98a05f750b1e723065cc..d6e46ee6d0054c152d721e92e354795c6f6002f8 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 
                if (!autostash)
                        require_clean_work_tree(N_("pull with rebase"),
-                               _("please commit or stash them."), 0);
+                               _("please commit or stash them."), 1, 0);
 
                if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
                        hashclr(rebase_fork_point);