commit 4cb8f8f3e6cc4a795c92823235070dd921c2b42e
from: Stefan Sperling <stsp@stsp.name>
date: Thu Mar 05 09:51:26 2020 UTC

fix wrong use of words in a histedit error message

commit - 37486c756a36ae590b41cae752b0c129f5fb7ff7
commit + 4cb8f8f3e6cc4a795c92823235070dd921c2b42e
blob - fc50380bc4c0fb4752f3e1718c004c136733c2e4
blob + 3ac85b3f5be39dea43b8996068d4306f33a35769
--- got/got.c
+++ got/got.c
@@ -6867,7 +6867,7 @@ cmd_histedit(int argc, char *argv[])
 		if (error)
 			goto done;
 		error = got_error_msg(GOT_ERR_CONFLICTS,
-		    "conflicts must be resolved before rebasing can continue");
+		    "conflicts must be resolved before histedit can continue");
 	} else
 		error = histedit_complete(worktree, fileindex, tmp_branch,
 		    branch, repo);