| changeset 2283 | e506c14382fd |
| parent 2214 | 6c6c0e5595a2 |
| child 2965 | 890e285c52a1 |
| 2282:2efa636eb411 | 2283:e506c14382fd |
|---|---|
26 |
26 |
27 hg co -C 0 |
27 hg co -C 0 |
28 echo foo-b > a |
28 echo foo-b > a |
29 hg commit -m "2b" -d "1000000 0" |
29 hg commit -m "2b" -d "1000000 0" |
30 |
30 |
31 HGMERGE=true hg update -m 1 |
31 HGMERGE=true hg merge 1 |
32 |
32 |
33 echo "%%% should show foo-b" |
33 echo "%%% should show foo-b" |
34 cat a |
34 cat a |
35 |
35 |
36 echo bar > b |
36 echo bar > b |