view tests/test-journal-exists @ 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 b6d8972ce339
children c40a1ee20aa5
line wrap: on
line source

#!/bin/sh

hg init
echo a > a
hg ci -Am0

touch .hg/store/journal

echo foo > a
hg ci -Am0

hg recover