Merge branch 'sg/wt-status-header-inclusion' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"