# HG changeset patch # User Wagner Bruna # Date 2012-08-02 14:28:21 # Node ID b5c560787a4e61be322059fbaf6a2269bad6a917 # Parent 39c01f8e7b39d986923b5445c1a51e323221bc75 histedit: sync docstring with edit comment The docstring should probably reuse the edit comment string instead. diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -33,7 +33,7 @@ file open in your editor:: # 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 @@ would reorganize the file to look like t # 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 #