Merge branch 'bc/push-match-many-refs'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"