Mercurial > hg
diff tests/test-merge-tools.out @ 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 | 9a4fe59b1eca |
children | 01ada7b1861d |
line wrap: on
line diff
--- a/tests/test-merge-tools.out Tue Jun 23 15:51:27 2009 +0200 +++ b/tests/test-merge-tools.out Sun Jun 21 03:11:52 2009 +0200 @@ -297,6 +297,51 @@ # hg stat M f +# ui.merge specifies internal:prompt: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config ui.merge=internal:prompt +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +# cat f +revision 1 +space +# hg stat +M f + +# ui.merge specifies internal:dump: +[merge-tools] +false.whatever= +true.priority=1 +true.executable=cat +# hg update -C 1 +# hg merge -r 2 --config ui.merge=internal:dump +merging f +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon +# cat f +revision 1 +space +# hg stat +M f +? f.base +? f.local +? f.orig +? f.other + +f.base: +revision 0 +space +f.local: +revision 1 +space +f.other: +revision 2 +space + # ui.merge specifies internal:other but is overruled by pattern for false: [merge-tools] false.whatever=