diff -r d93d340dc6ee -r 78d86664e3a2 tests/test-histedit-commute.t --- a/tests/test-histedit-commute.t Wed Dec 23 21:17:45 2015 +0000 +++ b/tests/test-histedit-commute.t Wed Dec 23 21:20:08 2015 +0000 @@ -64,12 +64,13 @@ # Commits are listed from least to most recent # # Commands: + # + # e, edit = use commit, but stop for amending + # m, mess = edit commit message without changing commit content # p, pick = use commit - # e, edit = use commit, but stop for amending + # d, drop = remove commit from history # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description - # d, drop = remove commit from history - # m, mess = edit commit message without changing commit content # edit the history @@ -342,12 +343,13 @@ # Commits are listed from least to most recent # # Commands: + # + # e, edit = use commit, but stop for amending + # m, mess = edit commit message without changing commit content # p, pick = use commit - # e, edit = use commit, but stop for amending + # d, drop = remove commit from history # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description - # d, drop = remove commit from history - # m, mess = edit commit message without changing commit content # should also work if a commit message is missing