Mercurial > hg
diff tests/test-merge-tools @ 8901:94319ae527cf
test merge-tools internal:dump and internal:prompt
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 21 Jun 2009 03:11:52 +0200 |
| parents | 0941ee76489e |
| children | 08a0f04b56bd |
line wrap: on
line diff
--- a/tests/test-merge-tools Tue Jun 23 15:51:27 2009 +0200 +++ b/tests/test-merge-tools Sun Jun 21 03:11:52 2009 +0200 @@ -121,6 +121,20 @@ echo "# ui.merge specifies internal:other:" domerge -r 2 --config ui.merge=internal:other +echo "# ui.merge specifies internal:prompt:" +domerge -r 2 --config ui.merge=internal:prompt + +echo "# ui.merge specifies internal:dump:" +domerge -r 2 --config ui.merge=internal:dump +echo f.base: +cat f.base +echo f.local: +cat f.local +echo f.other: +cat f.other +rm f.base f.local f.other +echo + echo "# ui.merge specifies internal:other but is overruled by pattern for false:" domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false