Merge branch 'rt/commit-cleanup-config'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"