view tests/test-conflict @ 3005:18c661e9abd9

mercurial.el: deal with more vagaries of "hg status".

If we run "hg status" on a file that does not exist, it prints an error
message.  Attempt to extract the name of the file.

#!/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"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status