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