| changeset 19803 | 0f64af33fb63 |
| parent 13437 | 6169493ac3f9 |
| child 33196 | 439b4d005b4a |
| 19802:94c394653b2a | 19803:0f64af33fb63 |
|---|---|
19 $ cd .. |
19 $ cd .. |
20 |
20 |
21 Should fail, since there are added files to subrepo: |
21 Should fail, since there are added files to subrepo: |
22 |
22 |
23 $ hg merge |
23 $ hg merge |
24 abort: outstanding uncommitted changes in subrepository 'subrepo' |
24 abort: uncommitted changes in subrepository 'subrepo' |
25 [255] |
25 [255] |