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

op=`basename $0 | sed -e 's/^git-//'`
exec hgit $op "$@"