Merge branch 'ik/userdiff-html-h-element-fix'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"