]> granicus.if.org Git - php/commit
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
authorNikita Popov <nikic@php.net>
Sat, 23 Mar 2013 17:26:11 +0000 (18:26 +0100)
committerNikita Popov <nikic@php.net>
Sat, 23 Mar 2013 17:26:11 +0000 (18:26 +0100)
commit9a56dce83fc22331cde819e67516c7a1a95ce3be
tree33485d8ae8a72c8e86d1769fce7ae5cd3725be2c
parentbda5c0b082ad78e71eb6c80b4268443f939a9bed
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
.gitattributes