Mercurial > hg
view tests/test-clone.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 | 0750f11152fe |
children | a7fcb43af82e |
line wrap: on
line source
updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions a not present checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions destination directory: a updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a#0