mergetools / gvimdiff2on commit Merge branch 'ld/p4-compare-dir-vs-symlink' (f723df5)
   1. "$MERGE_TOOLS_DIR/vimdiff"