--- a/hgext/histedit.py Wed Dec 23 21:17:45 2015 +0000
+++ b/hgext/histedit.py Wed Dec 23 21:20:08 2015 +0000
@@ -218,7 +218,8 @@
""" construct the editor comment
The comment includes::
- an intro
- - short commands
+ - sorted primary commands
+ - sorted short commands
Commands are only included once.
"""
@@ -229,12 +230,12 @@
Commands:""")
# i18n: command names and abbreviations must remain untranslated
verbs = _("""
+ 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
""")
return ''.join(['# %s\n' % l if l else '#\n'