Merge branch 'rs/xdiff-hunk-with-func-line' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"