diff hgext/histedit.py @ 18324:2eae2f9e85ef

merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Mon, 14 Jan 2013 10:17:06 -0600
parents 48deb483a8f8 7648b87e76db
children c605e12dd622
line wrap: on
line diff
--- a/hgext/histedit.py	Sun Jan 13 21:36:35 2013 +0100
+++ b/hgext/histedit.py	Mon Jan 14 10:17:06 2013 -0600
@@ -28,7 +28,7 @@
  pick 030b686bedc4 Add gamma
  pick 7c2fd3b9020c Add delta
 
- # Edit history between 633536316234 and 7c2fd3b9020c
+ # Edit history between c561b4e977df and 7c2fd3b9020c
  #
  # Commands:
  #  p, pick = use commit
@@ -47,7 +47,7 @@
  pick c561b4e977df Add beta
  fold 7c2fd3b9020c Add delta
 
- # Edit history between 633536316234 and 7c2fd3b9020c
+ # Edit history between c561b4e977df and 7c2fd3b9020c
  #
  # Commands:
  #  p, pick = use commit
@@ -108,8 +108,8 @@
 have made and return to the state before you attempted to edit your
 history.
 
-If we clone the example repository above and add three more changes, such that
-we have the following history::
+If we clone the histedit-ed example repository above and add four more
+changes, such that we have the following history::
 
    @  6[tip]   038383181893   2009-04-27 18:04 -0500   stefan
    |    Add theta