diff options
| author | INADA Naoki <methane@users.noreply.github.com> | 2017-02-21 09:17:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 09:17:06 (GMT) |
| commit | 3f3d0364a91aa8b89e175a49f93ad04dd4676186 (patch) | |
| tree | b89de30c4f2fa237fbedf5d07e127778e701ce6d /Doc/includes/setup.py | |
| parent | 32e8f9bdfd4324f1aa4fbbdf1ed8536f2b00cabb (diff) | |
| download | cpython-3f3d0364a91aa8b89e175a49f93ad04dd4676186.zip cpython-3f3d0364a91aa8b89e175a49f93ad04dd4676186.tar.gz cpython-3f3d0364a91aa8b89e175a49f93ad04dd4676186.tar.bz2 | |
Reduce conflict on Misc/NEWS (GH-212)
use "union" merge strategy for Misc/NEWS.
Diffstat (limited to 'Doc/includes/setup.py')
0 files changed, 0 insertions, 0 deletions