equal
deleted
inserted
replaced
99 |
99 |
100 $ hg update -q 'desc("modify outside/f1")' |
100 $ hg update -q 'desc("modify outside/f1")' |
101 $ hg merge 'desc("conflicting outside/f1")' |
101 $ hg merge 'desc("conflicting outside/f1")' |
102 abort: conflict in file 'outside/f1' is outside narrow clone (flat !) |
102 abort: conflict in file 'outside/f1' is outside narrow clone (flat !) |
103 abort: conflict in file 'outside/' is outside narrow clone (tree !) |
103 abort: conflict in file 'outside/' is outside narrow clone (tree !) |
104 [255] |
104 [20] |