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