Merge branch 'jk/fail-show-toplevel-outside-working-tree'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"