[MERGE] Switch heading markers to use - instead of =, to fix auto-resolve

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch adjusts the heading markers for NEWS to use - instead of =.
This fixes auto-resolution of text conflicts.  The problem is that
auto-resolution looks for merge conflict markers, and '========' is a
merge conflict marker.

I figure '-' is a reasonable heading marker, but I'm not stuck on it.
Just let's not bikeshed too long, eh?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHbHzj0F+nu1YWqI0RAszyAJ0TA6rM3Q91J/WsEaSxrttOtYA++QCfbg2M
IGoa0oalNitBUZnou8mMwuM=
=ptsc
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-vGNbl9.patch
Type: text/x-diff
Size: 9249 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071221/911cdb87/attachment-0001.bin