Merge branch 'tb/t5601-sed-fix'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"