Use SVN 1.5 merge properties, per recommendation in GCC wiki.
commitd8676cdfc2daf339700e6ba62d268e9e4cd4fc78
authorgfunck <gfunck@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 28 Jun 2010 22:11:42 +0000 (28 22:11 +0000)
committergfunck <gfunck@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 28 Jun 2010 22:11:42 +0000 (28 22:11 +0000)
tree864d6700e6b11a15b082f1239cd79a264e0581c1
parentf9994daa5c5d0a81ad7c213607b1362d04df80f8
Use SVN 1.5 merge properties, per recommendation in GCC wiki.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gupc@161515 138bc75d-0d04-0410-961f-82ee72b054a4