Mercurial > hg
changeset 20511:5840da876235
histedit: shorten new fold message
Lots of people, like Mr. Check-Code, insist on using 80-column terminals.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 15 Feb 2014 19:12:53 -0600 |
| parents | edfbcc3163a8 |
| children | 659b8d8ddf19 |
| files | hgext/histedit.py tests/test-histedit-arguments.t tests/test-histedit-bookmark-motion.t tests/test-histedit-commute.t tests/test-histedit-obsolete.t tests/test-histedit-outgoing.t |
| diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Feb 13 08:29:44 2014 +0100 +++ b/hgext/histedit.py Sat Feb 15 19:12:53 2014 -0600 @@ -35,7 +35,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 # @@ -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 # @@ -179,7 +179,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 #
--- 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 #
--- a/tests/test-histedit-bookmark-motion.t Thu Feb 13 08:29:44 2014 +0100 +++ b/tests/test-histedit-bookmark-motion.t Sat Feb 15 19:12:53 2014 -0600 @@ -72,7 +72,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 # @@ -132,7 +132,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 #
--- a/tests/test-histedit-commute.t Thu Feb 13 08:29:44 2014 +0100 +++ b/tests/test-histedit-commute.t Sat Feb 15 19:12:53 2014 -0600 @@ -66,7 +66,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 #
--- a/tests/test-histedit-obsolete.t Thu Feb 13 08:29:44 2014 +0100 +++ b/tests/test-histedit-obsolete.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 #
--- a/tests/test-histedit-outgoing.t Thu Feb 13 08:29:44 2014 +0100 +++ b/tests/test-histedit-outgoing.t Sat Feb 15 19:12:53 2014 -0600 @@ -48,7 +48,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 # @@ -79,7 +79,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 # @@ -102,7 +102,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 #