changeset 20511 | 5840da876235 |
parent 20503 | 23dc77874191 |
child 20806 | d66862b87ae6 |
--- a/tests/test-histedit-arguments.t Thu Feb 13 08:29:44 2014 +0100 +++ b/tests/test-histedit-arguments.t Sat Feb 15 19:12:53 2014 -0600 @@ -56,7 +56,7 @@ # Commands: # p, pick = use commit # e, edit = use commit, but stop for amending - # f, fold = use commit, but fold into previous commit (combines this commit with the one above) + # f, fold = use commit, but combine it with the one above # d, drop = remove commit from history # m, mess = edit message without changing commit content #