Merge branch 'rs/xdiff-ignore-ws-w-func-context'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"