commit 829974726320c65bc92c983b50e18de3daf703fb
from: Stefan Sperling <stsp@stsp.name>
date: Wed Jan 29 12:47:13 2020 UTC

improve wording of hint displayed for the histedit 'fold' command

commit - 1177268c8a611fc377c353a5ef4bb9416309a0d3
commit + 829974726320c65bc92c983b50e18de3daf703fb
blob - 7d06061d7b3cf0058211f33baf47d15394a9028e
blob + 4593c8e5ea92ca75e49cc572fb7b5518f60c4a01
--- got/got.c
+++ got/got.c
@@ -5577,7 +5577,8 @@ static struct got_histedit_cmd {
 } got_histedit_cmds[] = {
 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
-	{ GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
+	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
+	    "be used" },
 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
 	{ GOT_HISTEDIT_MESG, "mesg",
 	    "single-line log message for commit above (open editor if empty)" },