Merge branch 'cr/git-work-tree-sans-git-dir'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"