Commit 11495e04177c42cbbbab8416171bad777b37e5d0
2019-07-12T20:12:06
tweak 'got rebase' conflict error message
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/got/got.c b/got/got.c
index e1ed4ae..1da3e4d 100644
--- a/got/got.c
+++ b/got/got.c
@@ -3638,7 +3638,7 @@ cmd_rebase(int argc, char *argv[])
if (error)
goto done;
error = got_error_msg(GOT_ERR_CONFLICTS,
- "conflicts must be resolved before rebase can be resumed");
+ "conflicts must be resolved before rebasing can continue");
} else
error = rebase_complete(worktree, branch, new_base_branch,
tmp_branch, repo);
diff --git a/regress/cmdline/rebase.sh b/regress/cmdline/rebase.sh
index f3ebf51..3ffba83 100755
--- a/regress/cmdline/rebase.sh
+++ b/regress/cmdline/rebase.sh
@@ -206,7 +206,7 @@ function test_rebase_continue {
return 1
fi
- echo "got: conflicts must be resolved before rebase can be resumed" \
+ echo "got: conflicts must be resolved before rebasing can continue" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
@@ -312,7 +312,7 @@ function test_rebase_abort {
return 1
fi
- echo "got: conflicts must be resolved before rebase can be resumed" \
+ echo "got: conflicts must be resolved before rebasing can continue" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
@@ -420,7 +420,7 @@ function test_rebase_no_op_change {
return 1
fi
- echo "got: conflicts must be resolved before rebase can be resumed" \
+ echo "got: conflicts must be resolved before rebasing can continue" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
@@ -525,7 +525,7 @@ function test_rebase_in_progress {
return 1
fi
- echo "got: conflicts must be resolved before rebase can be resumed" \
+ echo "got: conflicts must be resolved before rebasing can continue" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"