Merge branch 'mm/checkout-auto-track-fix' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"