histedit: sync docstring with edit comment stable
authorWagner Bruna <wbruna@softwareexpress.com.br>
Thu, 02 Aug 2012 11:28:21 -0300
branchstable
changeset 17335 b5c560787a4e
parent 17334 39c01f8e7b39
child 17336 dd4cd949fa56
child 17340 96189d60d810
histedit: sync docstring with edit comment The docstring should probably reuse the edit comment string instead.
hgext/histedit.py
--- a/hgext/histedit.py	Sat Aug 04 14:37:17 2012 +0200
+++ b/hgext/histedit.py	Thu Aug 02 11:28:21 2012 -0300
@@ -33,7 +33,7 @@
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit
+ #  f, fold = use commit, but fold into previous commit (combines N and N-1)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
@@ -52,7 +52,7 @@
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit
+ #  f, fold = use commit, but fold into previous commit (combines N and N-1)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #