Merge branch 'gb/filter-branch-progress'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"