Mercurial > hg
diff tests/test-merge-internal-tools-pattern.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 | |
children | 628da4a91628 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-internal-tools-pattern.out Fri Apr 04 02:20:58 2008 +0300 @@ -0,0 +1,43 @@ +# initial file contents +adding f +line 1 +line 2 +line 3 +# branch 1: editing line 1 +# branch 2: editing line 3 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +# merge using internal:fail tool +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 2 + hg merge 1 +line 1 +line 2 +third line +M f +# merge using internal:local tool +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +line 1 +line 2 +third line +M f +# merge using internal:other tool +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +first line +line 2 +line 3 +M f +# merge using default tool +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +merging f +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +first line +line 2 +third line +M f