mergetools / gvimdiffon commit Merge branch 'po/clang-format-functype-weight' (0c13c4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"