mergetools / vimdiff3on commit Merge branch 'wd/userdiff-css' (8699b74)
   1. "$MERGE_TOOLS_DIR/vimdiff"