t5520: test pulling an octopus into an unborn branch
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"