mergetools / gvimdiff3on commit Merge branch 'sb/packfiles-in-repository' into next (caa68db)
   1. "$MERGE_TOOLS_DIR/vimdiff"