equal
deleted
inserted
replaced
11 cd .. |
11 cd .. |
12 mkdir test2 |
12 mkdir test2 |
13 cd test2 |
13 cd test2 |
14 |
14 |
15 hg init |
15 hg init |
16 hg merge ../test1 |
16 hg pull ../test1 |
17 hg co |
17 hg co |
18 chmod +x a |
18 chmod +x a |
19 hg ci -t "chmod +x a" -u test -d "0 0" |
19 hg ci -t "chmod +x a" -u test -d "0 0" |
20 |
20 |
21 cd ../test1 |
21 cd ../test1 |
22 echo 123 >>a |
22 echo 123 >>a |
23 hg ci -t "a updated" -u test -d "0 0" |
23 hg ci -t "a updated" -u test -d "0 0" |
24 |
24 |
25 hg merge ../test2 |
25 hg pull ../test2 |
26 hg heads |
26 hg heads |
27 hg history |
27 hg history |
28 |
28 |
29 hg -dv co -m |
29 hg -dv co -m |
30 |
30 |