equal
deleted
inserted
replaced
338 with: [11] foo to d |
338 with: [11] foo to d |
339 base: [10] added a d with bar in it, expect some beers |
339 base: [10] added a d with bar in it, expect some beers |
340 merging d |
340 merging d |
341 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
341 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
342 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
342 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
343 fix conflicts and see `hg help evolve.interrupted` |
343 unresolved merge conflicts |
|
344 (see 'hg help evolve.interrupted') |
344 [1] |
345 [1] |
345 |
346 |
346 $ echo foobar > d |
347 $ echo foobar > d |
347 $ hg resolve -m |
348 $ hg resolve -m |
348 (no more unresolved files) |
349 (no more unresolved files) |
397 with: [14] bar to d, expect beers |
398 with: [14] bar to d, expect beers |
398 base: [13] foo to d |
399 base: [13] foo to d |
399 merging d |
400 merging d |
400 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
401 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
401 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
402 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
402 fix conflicts and see `hg help evolve.interrupted` |
403 unresolved merge conflicts |
|
404 (see 'hg help evolve.interrupted') |
403 [1] |
405 [1] |
404 |
406 |
405 $ echo watbar > d |
407 $ echo watbar > d |
406 $ hg resolve -m |
408 $ hg resolve -m |
407 (no more unresolved files) |
409 (no more unresolved files) |
607 with: [4] More addition |
609 with: [4] More addition |
608 base: [1] More addition |
610 base: [1] More addition |
609 merging a |
611 merging a |
610 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
612 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
611 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
613 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
612 fix conflicts and see `hg help evolve.interrupted` |
614 unresolved merge conflicts |
|
615 (see 'hg help evolve.interrupted') |
613 [1] |
616 [1] |
614 |
617 |
615 $ cat > a <<EOF |
618 $ cat > a <<EOF |
616 > jungle |
619 > jungle |
617 > a |
620 > a |