Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"