Merge branch 'jc/push-2.0-default-to-simple' (early part)
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"