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

hg init
hg log
hg grep wah
hg manifest
hg verify