mergetools / gvimdiff2on commit Merge branch 'jc/directory-attrs-regression-fix' (f30366b)
   1. "$MERGE_TOOLS_DIR/vimdiff"