Merge branch 'jk/virtual-objects-do-exist'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"