mergetools / gvimdiff2on commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1. "$MERGE_TOOLS_DIR/vimdiff"