Merge branch 'nd/conditional-config-include' into next
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"