Merge branch 'nd/clean-preserve-errno-in-warning'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"