merge-lines-v2.patch: use merge-lines for all lines in all resolutions, except for roads in res 24. Enable merge-lines per default. 


git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2586 25d90789-57f7-4ee0-8453-03a3dfeeeb22