annotate tests/test-conflict @ 4384:caaba589d9c7

Use patch.patch() when checking for patch availability.

The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status