mergetools / vimdiff2on commit Merge branch 'jc/t3404-one-shot-export-fix' (18a86f3)
   1. "$MERGE_TOOLS_DIR/vimdiff"