[MERGE REVIEW] Revert destroys file contents produced by merge

[Aaron Bentley]

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

In the spirit of peace, love, understanding, and arguing about better
things, I've switched from splatfile to rio, and removed splatfile.

I've also included a header, as you suggested.

How does this version look?

(also in http://code.aaronbentley.com/bzr/bzr.ttransform/)

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

iD8DBQFEBSGL0F+nu1YWqI0RAkWaAJ4+I2X2Fszgmd6VvWXwYlgQ/BtHjQCdGs/J
lBoHYXlQ9eQQ+y0QnXhrLRw=
=teUD
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-modified.patch
Type: text/x-patch
Size: 9933 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060228/368cef70/attachment.bin