Merge branch 'an/ignore-doc-update' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"