mergetools / vimdiff2on commit t6302: simplify non-gpg cases (f307218)
   1. "$MERGE_TOOLS_DIR/vimdiff"