diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -38,7 +38,7 @@ file open in your editor::
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
In this file, lines beginning with ``#`` are ignored. You must specify a rule
@@ -60,7 +60,7 @@ would reorganize the file to look like t
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
At which point you close the editor and ``histedit`` starts working. When you
@@ -198,7 +198,7 @@ editcomment = _("""# Edit history betwee
# 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 message without changing commit content
+# m, mess = edit commit message without changing commit content
#
""")
diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
--- a/tests/test-histedit-arguments.t
+++ b/tests/test-histedit-arguments.t
@@ -69,7 +69,7 @@ Run a dummy edit to make sure we get tip
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -292,7 +292,7 @@ Test that trimming description using mul
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
--- a/tests/test-histedit-bookmark-motion.t
+++ b/tests/test-histedit-bookmark-motion.t
@@ -75,7 +75,7 @@
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose << EOF | grep histedit
@@ -136,7 +136,7 @@
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose << EOF | grep histedit
diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t
--- a/tests/test-histedit-commute.t
+++ b/tests/test-histedit-commute.t
@@ -69,7 +69,7 @@ show the edit commands offered
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -347,7 +347,7 @@ Verify that revsetalias entries work wit
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -54,7 +54,7 @@ Enable obsolete
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg histedit 1 --commands - --verbose <<EOF | grep histedit
diff --git a/tests/test-histedit-outgoing.t b/tests/test-histedit-outgoing.t
--- a/tests/test-histedit-outgoing.t
+++ b/tests/test-histedit-outgoing.t
@@ -51,7 +51,7 @@ show the edit commands offered by outgoi
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
@@ -83,7 +83,7 @@ show the error from unrelated repos
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
@@ -107,7 +107,7 @@ test sensitivity to branch in URL:
# 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 message without changing commit content
+ # m, mess = edit commit message without changing commit content
#
0 files updated, 0 files merged, 0 files removed, 0 files unresolved