mergetools / vimdiff2on commit Merge branch 'mp/complete-paths' (d931e2f)
   1. "$MERGE_TOOLS_DIR/vimdiff"