Mercurial > hg
comparison tests/test-merge-tools.t @ 26967:7a8e9a985c3b
filemerge: remove leading space from " no tool found..."
I could not find or see a reason for the unusual formatting. The lines
following it in the test cases are not indented.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 11 Nov 2015 10:19:11 -0800 |
parents | 5f88e092f82c |
children | 4ab69be0ea15 |
comparison
equal
deleted
inserted
replaced
26966:51fa43a3cd58 | 26967:7a8e9a985c3b |
---|---|
529 false.whatever= | 529 false.whatever= |
530 true.priority=1 | 530 true.priority=1 |
531 true.executable=cat | 531 true.executable=cat |
532 # hg update -C 1 | 532 # hg update -C 1 |
533 $ hg merge -r 2 --config ui.merge=internal:prompt | 533 $ hg merge -r 2 --config ui.merge=internal:prompt |
534 no tool found to merge f | 534 no tool found to merge f |
535 keep (l)ocal or take (o)ther? l | 535 keep (l)ocal or take (o)ther? l |
536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 536 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
537 (branch merge, don't forget to commit) | 537 (branch merge, don't forget to commit) |
538 $ aftermerge | 538 $ aftermerge |
539 # cat f | 539 # cat f |
551 false.whatever= | 551 false.whatever= |
552 true.priority=1 | 552 true.priority=1 |
553 true.executable=cat | 553 true.executable=cat |
554 # hg update -C 1 | 554 # hg update -C 1 |
555 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true | 555 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
556 no tool found to merge f | 556 no tool found to merge f |
557 keep (l)ocal or take (o)ther? | 557 keep (l)ocal or take (o)ther? |
558 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 558 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
559 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 559 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
560 [1] | 560 [1] |
561 $ aftermerge | 561 $ aftermerge |
565 # hg stat | 565 # hg stat |
566 M f | 566 M f |
567 # hg resolve --list | 567 # hg resolve --list |
568 U f | 568 U f |
569 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | 569 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
570 no tool found to merge f | 570 no tool found to merge f |
571 keep (l)ocal or take (o)ther? | 571 keep (l)ocal or take (o)ther? |
572 [1] | 572 [1] |
573 $ aftermerge | 573 $ aftermerge |
574 # cat f | 574 # cat f |
575 revision 1 | 575 revision 1 |
579 ? f.orig | 579 ? f.orig |
580 # hg resolve --list | 580 # hg resolve --list |
581 U f | 581 U f |
582 $ rm f | 582 $ rm f |
583 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | 583 $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
584 no tool found to merge f | 584 no tool found to merge f |
585 keep (l)ocal or take (o)ther? | 585 keep (l)ocal or take (o)ther? |
586 [1] | 586 [1] |
587 $ aftermerge | 587 $ aftermerge |
588 # cat f | 588 # cat f |
589 revision 1 | 589 revision 1 |
591 # hg stat | 591 # hg stat |
592 M f | 592 M f |
593 # hg resolve --list | 593 # hg resolve --list |
594 U f | 594 U f |
595 $ hg resolve --all --config ui.merge=internal:prompt | 595 $ hg resolve --all --config ui.merge=internal:prompt |
596 no tool found to merge f | 596 no tool found to merge f |
597 keep (l)ocal or take (o)ther? l | 597 keep (l)ocal or take (o)ther? l |
598 (no more unresolved files) | 598 (no more unresolved files) |
599 $ aftermerge | 599 $ aftermerge |
600 # cat f | 600 # cat f |
601 revision 1 | 601 revision 1 |