view tests/test-issue433 @ 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 7a7d4937272b
children 1de6e7e1bb9f
line wrap: on
line source

#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue433

hg init a
cd a
echo a > a
hg commit -Ama

hg parents -r 0 doesnotexist
true