]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 32e8f9b) | patch
Reduce conflict on Misc/NEWS (GH-212)
authorINADA Naoki <methane@users.noreply.github.com>
Tue, 21 Feb 2017 09:17:06 +0000 (18:17 +0900)
committerGitHub <noreply@github.com>
Tue, 21 Feb 2017 09:17:06 +0000 (18:17 +0900)
commit3f3d0364a91aa8b89e175a49f93ad04dd4676186
treeb89de30c4f2fa237fbedf5d07e127778e701ce6dtree | snapshot
parent32e8f9bdfd4324f1aa4fbbdf1ed8536f2b00cabbcommit | diff
Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.
.gitattribute [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.