view tests/test-lock-badness @ 7731:737f274d1915

test-merge-tools

Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py

#!/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