mergetools / gvimdiff3on commit Merge branch 'mo/clang-format-for-each-update' into maint (27e4131)
   1. "$MERGE_TOOLS_DIR/vimdiff"