Mercurial > hg
comparison tests/test-merge-tools.out @ 8539:9a4fe59b1eca
test-merge-tools: windows fixes
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 21 May 2009 22:43:38 +0200 |
parents | e945e012d5d1 |
children | 94319ae527cf |
comparison
equal
deleted
inserted
replaced
8538:6419bc7b3d9c | 8539:9a4fe59b1eca |
---|---|
154 [merge-tools] | 154 [merge-tools] |
155 false.whatever= | 155 false.whatever= |
156 true.priority=1 | 156 true.priority=1 |
157 true.executable=cat | 157 true.executable=cat |
158 # hg update -C 1 | 158 # hg update -C 1 |
159 # hg merge -r 2 --config merge-tools.true.executable=/bin/cat | 159 # hg merge -r 2 --config merge-tools.true.executable=cat |
160 revision 1 | 160 revision 1 |
161 space | 161 space |
162 revision 0 | 162 revision 0 |
163 space | 163 space |
164 revision 2 | 164 revision 2 |
457 [merge-tools] | 457 [merge-tools] |
458 false.whatever= | 458 false.whatever= |
459 true.priority=1 | 459 true.priority=1 |
460 true.executable=cat | 460 true.executable=cat |
461 # hg update -C 1 | 461 # hg update -C 1 |
462 # hg merge -r 2 --config merge-tools.true.checkchanged=1 | 462 # hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
463 revision 1 | 463 revision 1 |
464 space | 464 space |
465 revision 0 | 465 revision 0 |
466 space | 466 space |
467 revision 2 | 467 revision 2 |
468 space | 468 space |
469 merging f | 469 merging f |
470 merging f failed! | 470 merging f failed! |
471 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 471 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
472 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 472 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
473 # cat f | 473 # cat f |
474 revision 1 | 474 revision 1 |
475 space | 475 space |
476 # hg stat | 476 # hg stat |
477 M f | 477 M f |
478 ? f.orig | 478 ? f.orig |
479 | 479 |