view tests/test-unrelated-pull @ 830:ca080d28d0af

If rejects are empty after using the editor, merge with diff+patch was ok.

#!/bin/sh

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "0 0"

cd ..
mkdir b
cd b
hg init 
echo 321 > b
hg add b
hg commit -m "b" -u b -d "0 0"

hg pull ../a
hg heads