hgbook
view en/examples/ch04/resolve @ 680:7226e5e750a6
Clean up chapter 8, and add content
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Apr 21 23:49:27 2009 -0700 (2009-04-21) |
| parents | |
| children | f3a4e6040421 |
line source
1 #$ name: init
2 hg init conflict
3 cd conflict
4 echo first > myfile.txt
5 hg ci -A -m first
6 cd ..
7 hg clone conflict left
8 hg clone conflict right
10 #$ name: left
11 cd left
12 echo left >> myfile.txt
13 hg ci -m left
15 #$ name: right
16 cd ../right
17 echo right >> myfile.txt
18 hg ci -m right
20 #$ name: pull
21 cd ../conflict
22 hg pull -u ../left
23 hg pull -u ../right
25 #$ name: heads
26 hg heads
28 #$ name: export
29 export HGMERGE=merge
31 #$ name: merge
32 hg merge
34 #$ name: cifail
35 hg commit -m 'Attempt to commit a failed merge'
37 #$ name: list
38 hg resolve -l