Merge branch 'rs/t3700-clean-leftover' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"