mergetools / gvimdiff2on commit merge: save merge state earlier (9d89b35)
   1. "$MERGE_TOOLS_DIR/vimdiff"