# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1392513173 21600
# Node ID 5840da876235deb09760939729c6d52fe5357c23
# Parent  edfbcc3163a89df8b9a77d658cb375dcbbf61244
histedit: shorten new fold message

Lots of people, like Mr. Check-Code, insist on using 80-column terminals.

diff -r edfbcc3163a8 -r 5840da876235 hgext/histedit.py
--- 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
 #
diff -r edfbcc3163a8 -r 5840da876235 tests/test-histedit-arguments.t
--- 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
   #
diff -r edfbcc3163a8 -r 5840da876235 tests/test-histedit-bookmark-motion.t
--- 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
   #
diff -r edfbcc3163a8 -r 5840da876235 tests/test-histedit-commute.t
--- 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
   #
diff -r edfbcc3163a8 -r 5840da876235 tests/test-histedit-obsolete.t
--- 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
   #
diff -r edfbcc3163a8 -r 5840da876235 tests/test-histedit-outgoing.t
--- 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
   #