commit 11495e04177c42cbbbab8416171bad777b37e5d0
from: Stefan Sperling <stsp@stsp.name>
date: Fri Jul 12 18:12:06 2019 UTC

tweak 'got rebase' conflict error message

commit - 778a73c202451031815f6c71287901ff5ac448bb
commit + 11495e04177c42cbbbab8416171bad777b37e5d0
blob - e1ed4ae2c8467d4933272acb2f436974fd775490
blob + 1da3e4d16811a6f59a07fba917970f48915013c5
--- got/got.c
+++ 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);
blob - f3ebf5179a903e981856e11706397cc83b0b9a50
blob + 3ffba83356a76ba9d0770740495992ede2469262
--- regress/cmdline/rebase.sh
+++ 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="$?"