mergetools / vimdiff2on commit stash: optionally use the scripted version again (90a4627)
   1. "$MERGE_TOOLS_DIR/vimdiff"