Mercurial > hg
view tests/test-addremove-similar.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 | 8d982aef0be1 |
children | c978d6752dbb |
line wrap: on
line source
adding empty-file adding large-file adding another-file removing empty-file removing large-file recording removal of large-file as rename to another-file (99% similar) % comparing two empty files caused ZeroDivisionError in the past 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding another-empty-file removing empty-file adding large-file adding tiny-file adding small-file removing large-file removing tiny-file recording removal of tiny-file as rename to small-file (82% similar) % should all fail abort: similarity must be a number abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100