Mercurial > hg
view tests/test-mq-qdiff.out @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | 3d1f9dcecdea |
children | 034f444902d9 |
line wrap: on
line source
% init % commit adding base % qnew mqbase % qrefresh % qdiff diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched