mergetools / vimdiff3on commit Merge branch 'mk/diff-shortstat-dirstat-fix' (b6488fe)
   1. "$MERGE_TOOLS_DIR/vimdiff"