Mercurial > hg
view tests/test-requires @ 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 | 8f18e31c4441 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg add a hg commit -m test -d "1000000 0" rm .hg/requires hg tip echo indoor-pool > .hg/requires hg tip true