| changeset 21266 | 19d6fec60b81 |
| parent 18605 | bcf29565d89f |
| child 21267 | e4f451c8c05c |
| 21265:232de244ab6f | 21266:19d6fec60b81 |
|---|---|
55 > two-point-five |
55 > two-point-five |
56 > three |
56 > three |
57 > EOF |
57 > EOF |
58 $ rm -f *.orig |
58 $ rm -f *.orig |
59 $ hg resolve -m test.txt |
59 $ hg resolve -m test.txt |
60 no unresolved files; you may continue your unfinished operation |
|
60 $ hg commit -m "Merge 1" |
61 $ hg commit -m "Merge 1" |
61 |
62 |
62 change test-a again |
63 change test-a again |
63 $ cd ../test-a |
64 $ cd ../test-a |
64 $ cat >test.txt <<"EOF" |
65 $ cat >test.txt <<"EOF" |