mergetools / gvimdiff2on commit Merge branch 'ad/rebase-i-serie-typofix' into maint (8ff22f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"