equal
deleted
inserted
replaced
1454 $ hg graft -r 1 -r 2 --user batman |
1454 $ hg graft -r 1 -r 2 --user batman |
1455 grafting 1:80e6d2c47cfe "added b" |
1455 grafting 1:80e6d2c47cfe "added b" |
1456 merging b |
1456 merging b |
1457 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
1457 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
1458 abort: unresolved conflicts, can't continue |
1458 abort: unresolved conflicts, can't continue |
1459 (use 'hg resolve' and 'hg graft --continue --user batman') |
1459 (use 'hg resolve' and 'hg graft --continue') |
1460 [255] |
1460 [255] |
1461 |
1461 |
1462 $ echo wat > b |
1462 $ echo wat > b |
1463 $ hg resolve -m |
1463 $ hg resolve -m |
1464 (no more unresolved files) |
1464 (no more unresolved files) |
1504 $ hg graft -r 1 -r 2 --date '1234560000 120' |
1504 $ hg graft -r 1 -r 2 --date '1234560000 120' |
1505 grafting 1:80e6d2c47cfe "added b" |
1505 grafting 1:80e6d2c47cfe "added b" |
1506 merging b |
1506 merging b |
1507 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
1507 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
1508 abort: unresolved conflicts, can't continue |
1508 abort: unresolved conflicts, can't continue |
1509 (use 'hg resolve' and 'hg graft --continue --date '1234560000 120'') |
1509 (use 'hg resolve' and 'hg graft --continue') |
1510 [255] |
1510 [255] |
1511 |
1511 |
1512 $ echo foobar > b |
1512 $ echo foobar > b |
1513 $ hg resolve -m |
1513 $ hg resolve -m |
1514 (no more unresolved files) |
1514 (no more unresolved files) |