merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests

#!/bin/sh

unset HGUSER
EMAIL="My Name <myname@example.com>"
export EMAIL

hg init test
cd test
touch asdf
hg add asdf
hg commit -d '1000000 0' -m commit-1
hg tip