view tests/test-1102 @ 7731:737f274d1915

test-merge-tools

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

#!/bin/sh

rm -rf a
hg init a
cd a
echo a > a
hg ci -Am0
hg tag t1 # 1
hg tag --remove t1 # 2

hg co 1
hg tag -r0 t1
hg tags