diff options
| author | INADA Naoki <methane@users.noreply.github.com> | 2017-02-21 18:17:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 18:17:06 +0900 |
| commit | 3f3d0364a91aa8b89e175a49f93ad04dd4676186 (patch) | |
| tree | b89de30c4f2fa237fbedf5d07e127778e701ce6d | |
| parent | 32e8f9bdfd4324f1aa4fbbdf1ed8536f2b00cabb (diff) | |
| download | cpython-git-3f3d0364a91aa8b89e175a49f93ad04dd4676186.tar.gz | |
Reduce conflict on Misc/NEWS (GH-212)
use "union" merge strategy for Misc/NEWS.
| -rw-r--r-- | .gitattribute | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattribute b/.gitattribute new file mode 100644 index 0000000000..253cc6dee4 --- /dev/null +++ b/.gitattribute @@ -0,0 +1 @@ +Misc/NEWS merge=union |