[Python-checkins] [python/cpython] 3f3d03: Reduce conflict on Misc/NEWS (GH-212)

GitHub noreply at github.com
Tue Feb 21 04:17:08 EST 2017

• Previous message (by thread): [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
• Next message (by thread): [Python-checkins] [python/cpython] 2c700a: .gitattribute -> .gitattributes (GH-213)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

 Branch: refs/heads/master
 Home: https://github.com/python/cpython
 Commit: 3f3d0364a91aa8b89e175a49f93ad04dd4676186
 https://github.com/python/cpython/commit/3f3d0364a91aa8b89e175a49f93ad04dd4676186
 Author: INADA Naoki <methane at users.noreply.github.com>
 Date: 2017年02月21日 (2017年2月21日)
 Changed paths:
 A .gitattribute
 Log Message:
 -----------
 Reduce conflict on Misc/NEWS (GH-212)
use "union" merge strategy for Misc/NEWS.

---

• Previous message (by thread): [Python-checkins] Daily reference leaks (4243df51fe43): sum=4
• Next message (by thread): [Python-checkins] [python/cpython] 2c700a: .gitattribute -> .gitattributes (GH-213)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list