mergetools / gvimdiff2on commit mv: prevent mismatched data when ignoring errors. (fb8a4e8)
   1. "$MERGE_TOOLS_DIR/vimdiff"