[bug] revert reverting the wrong file....

[Aaron Bentley]

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

Erik B?gfors wrote:
| Today something like this happened and I lost about 15 min of work
| (glad it wasn't more). This is reproducable with current bzr.dev

Mea culpa.  Sorry about that.

I was using $FILENAME.new as a temp filename in ApplyMerge3, but I'll
fix it.

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

iD8DBQFD0IbM0F+nu1YWqI0RArqpAJwJrKS3KhK1VGJBbbtTDMUaKt4S9gCfbPfH
UtgzVsrD6E/rjnzl3IMIlxg=
=hPiP
-----END PGP SIGNATURE-----