Merge branch 'ls/clean-smudge-override-in-config'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"