changeset 6385 | 0d4e068e9e52 |
parent 5283 | 4fe04b183fd8 |
child 8167 | 6c82beaaa11a |
6384:8bc876e03143 | 6385:0d4e068e9e52 |
---|---|
14 HGMERGE=true hg merge -q $p2 |
14 HGMERGE=true hg merge -q $p2 |
15 fi |
15 fi |
16 |
16 |
17 echo >> foo |
17 echo >> foo |
18 |
18 |
19 hg commit -d '0 0' -qAm "$msg" foo |
19 hg commit -d '0 0' -qAm "$msg" |
20 } |
20 } |
21 |
21 |
22 hg init repo |
22 hg init repo |
23 cd repo |
23 cd repo |
24 |
24 |