Mercurial > hg
view tests/test-convert-clonebranches.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 | 49c69e1e4aa2 |
children | 827d4e807d57 |
line wrap: on
line source
marked working directory as branch branch0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % convert 3 adda 2 addb pulling from default into branch0 1 changesets found 1 changea 0 mergeab pulling from default into branch0 1 changesets found marked working directory as branch branch1 marked working directory as branch branch2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) marked working directory as branch branch3 % incremental conversion 2 c2 pulling from branch0 into branch2 2 changesets found 1 c1 pulling from branch0 into branch1 2 changesets found 0 c3 pulling from branch2 into branch3 3 changesets found pulling from branch1 into branch3 1 changesets found