Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"