Mercurial > hg
view tests/test-lock-badness @ 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 |
line wrap: on
line source
#!/bin/sh hg init a echo a > a/a hg --cwd a ci -A -m a hg clone a b echo b > b/b hg --cwd b ci -A -m b chmod 100 a/.hg/store hg --cwd b push ../a chmod 700 a/.hg/store