mergetools / gvimdiff3on commit Merge branch 'dk/format-patch-ignore-diff-submodule' into maint (6606129)
   1. "$MERGE_TOOLS_DIR/vimdiff"