Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"