Mercurial > hg
view tests/test-custom-filters.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 | f3a8b5360100 |
children |
line wrap: on
line source
% Repository data: Some stuff to ponder very carefully. % Fresh checkout: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Copyright 2046, The Masters Some stuff to ponder very carefully. M stuff.txt % Problem encoding: abort: missing header "Copyright 2046, The Masters" in morestuff.txt M stuff.txt A morestuff.txt