Merge branch 'sb/checkout-test-complex-path'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"