diff hgext/histedit.py @ 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 23dc77874191
children 70d02abff434
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
 #