changeset 17335:b5c560787a4e stable

histedit: sync docstring with edit comment The docstring should probably reuse the edit comment string instead.
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Thu, 02 Aug 2012 11:28:21 -0300
parents 39c01f8e7b39
children dd4cd949fa56 96189d60d810
files hgext/histedit.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
  #