Mercurial > hg
view tests/test-pull-permission @ 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 | c0b449154a90 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo foo > b hg add b hg ci -m "b" -d "1000000 0" chmod -w .hg/store cd .. hg clone a b chmod +w a/.hg/store # let test clean up cd b hg verify