mergetools / gvimdiff3on commit Merge branch 'bc/hash-algo' into next (18f36d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"