Merge branch 'rh/template-updates'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"