mergetools / gvimdiff3on commit Merge branch 'bw/git-clang-format' into next (ae51a4e)
   1. "$MERGE_TOOLS_DIR/vimdiff"