mergetools / gvimdiff2on commit Merge branch 'jk/suppress-clang-warning' into maint (4aaafdc)
   1. "$MERGE_TOOLS_DIR/vimdiff"