tests/test-merge3

Inherit config from real parentui and don't use ConfigParser internals.
Added comments for the meaning of parentui.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"