equal
deleted
inserted
replaced
280 $ echo This is file b22 > b |
280 $ echo This is file b22 > b |
281 merge fails |
281 merge fails |
282 $ hg merge 2 |
282 $ hg merge 2 |
283 abort: uncommitted changes |
283 abort: uncommitted changes |
284 (use 'hg status' to list changes) |
284 (use 'hg status' to list changes) |
285 [255] |
285 [20] |
286 merge expected! |
286 merge expected! |
287 $ hg merge -f 2 |
287 $ hg merge -f 2 |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
289 (branch merge, don't forget to commit) |
289 (branch merge, don't forget to commit) |
290 $ hg diff --nodates |
290 $ hg diff --nodates |
317 $ echo This is file b33 > b |
317 $ echo This is file b33 > b |
318 merge of b should fail |
318 merge of b should fail |
319 $ hg merge 2 |
319 $ hg merge 2 |
320 abort: uncommitted changes |
320 abort: uncommitted changes |
321 (use 'hg status' to list changes) |
321 (use 'hg status' to list changes) |
322 [255] |
322 [20] |
323 merge of b expected |
323 merge of b expected |
324 $ hg merge -f 2 |
324 $ hg merge -f 2 |
325 merging b |
325 merging b |
326 merging for b |
326 merging for b |
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |