Merge branch 'rs/c-auto-resets-attributes' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"