Merge branch 'mk/combine-diff-context-horizon-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"