Merge branch 'jc/combine-diff-many-parents'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"