Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"