diff options
| -rwxr-xr-x | git-am.sh | 2 | ||||
| -rwxr-xr-x | t/t4151-am-abort.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -456,7 +456,7 @@ do stop_here $this fi - printf 'Applying %s\n' "$FIRSTLINE" + printf 'Applying: %s\n' "$FIRSTLINE" case "$resolved" in '') diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 249093b6d0..f45ab0a2e8 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -43,7 +43,7 @@ do test_expect_success "am$with3 --skip continue after failed am$with3" ' test_must_fail git-am$with3 --skip >output && - test "$(grep "^Applying" output)" = "Applying 6" && + test "$(grep "^Applying" output)" = "Applying: 6" && test_cmp file-2-expect file-2 && test ! -f .git/rr-cache/MERGE_RR ' |