]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 32e8f9b)
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)
use "union" merge strategy for Misc/NEWS.

.gitattribute [new file with mode: 0644] patch | blob

diff --git a/.gitattribute b/.gitattribute
new file mode 100644 (file)
index 0000000..253cc6d
--- /dev/null
+++ b/.gitattribute
@@ -0,0 +1 @@
+Misc/NEWS   merge=union
Unnamed repository; edit this file 'description' to name the repository.