tests/test-merge3

remove the gpg stuff from hgeditor (superseded by the signing extension)

remove the gpg stuff from hgeditor, update the comments to make it clear
it can be used to show a diff while commiting

#!/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"