view tests/test-issue842 @ 7665:950484f05f16

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.
author Pascal Quantin <pascal.quantin@gmail.com>
date Sat, 17 Jan 2009 18:51:40 +0100
parents 4b0c9c674707
children cb93eee1fbcd
line wrap: on
line source

hg init test
cd test
echo foo > a
hg ci -Ama

hg up -r0000
echo bar > a
echo % should issue warning
hg ci -Amb

hg up -r0000
echo stuffy > a
echo % should not issue warning
hg ci -q -Amc

hg up -r0000
echo crap > a
hg branch testing
echo % should not issue warning
hg ci -q -Amd