diff en/examples/rename.divergent @ 773:3b640272a966

Progres on resolve
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 12 Apr 2009 00:05:30 -0700
parents 91a936be78b8
children
line wrap: on
line diff
--- a/en/examples/rename.divergent	Thu Apr 09 22:54:10 2009 -0700
+++ b/en/examples/rename.divergent	Sun Apr 12 00:05:30 2009 -0700
@@ -14,7 +14,7 @@
 #$ name: rename.anne
 
 cd anne
-hg mv foo bar
+hg rename foo bar
 hg ci -m 'Rename foo to bar'
 
 #$ name: rename.bob