equal
deleted
inserted
replaced
435 |
435 |
436 |
436 |
437 |
437 |
438 |
438 |
439 % errors encountered |
439 % errors encountered |
|
440 % merge/resolve |
|
441 % simplemerge |
|
442 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
443 created new head |
|
444 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
445 (branch merge, don't forget to commit) |
|
446 $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
|
447 foo |
|
448 % conflict |
|
449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
450 created new head |
|
451 merging m |
|
452 warning: conflicts during merge. |
|
453 merging m failed! |
|
454 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
455 use 'hg resolve' to retry unresolved file merges |
|
456 % keyword stays outside conflict zone |
|
457 $Id$ |
|
458 <<<<<<< local |
|
459 bar |
|
460 ======= |
|
461 foo |
|
462 >>>>>>> other |
|
463 % resolve to local |
|
464 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
|
465 bar |
440 % switch off expansion |
466 % switch off expansion |
441 % kwshrink with unknown file u |
467 % kwshrink with unknown file u |
442 overwriting a shrinking keywords |
468 overwriting a shrinking keywords |
|
469 overwriting m shrinking keywords |
443 overwriting x/a shrinking keywords |
470 overwriting x/a shrinking keywords |
444 % cat |
471 % cat |
445 expand $Id$ |
472 expand $Id$ |
446 do not process $Id: |
473 do not process $Id: |
447 xxx $ |
474 xxx $ |