mergetools / gvimdiff3on commit Merge branch 'rs/t3700-clean-leftover' into maint (f35a1d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"