Mercurial > hg-stable
changeset 22030:ecdff28d13e2
mergetools: add a test for premerge --keep
It works! No surprise.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 04 Aug 2014 16:50:15 -0700 |
| parents | f28329171a86 |
| children | b36c60cfe46f |
| files | tests/test-merge-tools.t |
| diffstat | 1 files changed, 33 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Mon Aug 04 16:39:47 2014 -0700 +++ b/tests/test-merge-tools.t Mon Aug 04 16:50:15 2014 -0700 @@ -709,6 +709,39 @@ # hg stat M f +premerge=keep keeps conflict markers in: + + $ beforemerge + [merge-tools] + false.whatever= + true.priority=1 + true.executable=cat + # hg update -C 1 + $ hg merge -r 4 --config merge-tools.true.premerge=keep + merging f + <<<<<<< local: ef83787e2614 - test: revision 1 + revision 1 + space + ======= + revision 4 + >>>>>>> other: 81448d39c9a0 - test: revision 4 + revision 0 + space + revision 4 + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ aftermerge + # cat f + <<<<<<< local: ef83787e2614 - test: revision 1 + revision 1 + space + ======= + revision 4 + >>>>>>> other: 81448d39c9a0 - test: revision 4 + # hg stat + M f + + Tool execution set tools.args explicit to include $base $local $other $output: