| changeset 414 | 291a62848f54 |
| parent 412 | 40cfa2d0c088 |
| child 440 | 22b5aaeb3637 |
| 413:a3b5347c22cd | 414:291a62848f54 |
|---|---|
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 ls -l ../test[12]/a |
|
26 |
|
27 hg merge ../test2 |
25 hg merge ../test2 |
28 hg heads |
26 hg heads |
29 hg history |
27 hg history |
30 |
28 |
31 hg -dv co -m |
29 hg -dv co -m |