mergetools / gvimdiff3on commit Merge branch 'dc/fmt-merge-msg-microcleanup' into maint (de55703)
   1. "$MERGE_TOOLS_DIR/vimdiff"