Merge branch 'dk/version-gen-gitdir'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"