comparison 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
comparison
equal deleted inserted replaced
772:dbe5f4bb6507 773:3b640272a966
12 hg clone orig bob 12 hg clone orig bob
13 13
14 #$ name: rename.anne 14 #$ name: rename.anne
15 15
16 cd anne 16 cd anne
17 hg mv foo bar 17 hg rename foo bar
18 hg ci -m 'Rename foo to bar' 18 hg ci -m 'Rename foo to bar'
19 19
20 #$ name: rename.bob 20 #$ name: rename.bob
21 21
22 cd ../bob 22 cd ../bob