Merge branch 'jc/push-2.0-default-to-simple'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"