mergetools / gvimdiff3on commit Merge branch 'ad/submitting-patches-title-decoration' into maint (b51df7d)
   1. "$MERGE_TOOLS_DIR/vimdiff"