equal
deleted
inserted
replaced
64 $ hg commit -m "commit #2" |
64 $ hg commit -m "commit #2" |
65 created new head |
65 created new head |
66 $ echo This is file b2 > b |
66 $ echo This is file b2 > b |
67 merge should fail |
67 merge should fail |
68 $ hg merge 1 |
68 $ hg merge 1 |
69 abort: untracked file in working directory differs from file in requested revision: 'b' |
69 b: untracked file differs |
|
70 abort: untracked files in working directory differ from files in requested revision |
70 [255] |
71 [255] |
71 merge of b expected |
72 merge of b expected |
72 $ hg merge -f 1 |
73 $ hg merge -f 1 |
73 merging b |
74 merging b |
74 merging for b |
75 merging for b |