Merge branch 'nd/shallow-fixup' into maint

diff --git a/builtin/am.c b/builtin/am.c
index 7cf40e6f2796f641b5ca075d9c93b54a1b33ff9f..826f18ba12d9c58ceb3e8d6998412c234b33bcfe 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2134,7 +2134,7 @@ static int safe_to_abort(const struct am_state *state)
        if (!oidcmp(&head, &abort_safety))
                return 1;
 
-       error(_("You seem to have moved HEAD since the last 'am' failure.\n"
+       warning(_("You seem to have moved HEAD since the last 'am' failure.\n"
                "Not rewinding to ORIG_HEAD"));
 
        return 0;