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

# should print nothing
# should print ? b/x
? b/x
# should print A b/x
A b/x
# should forget b/x
forgetting b/x
# should print nothing