[MERGE] Fix missing pending merges

[John Arbash Meinel]

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

Jelmer Vernooij wrote:
> On Tue, 2006-06-27 at 10:50 +0200, Jelmer Vernooij wrote:
>> On Tue, 2006-06-27 at 18:30 +1000, Robert Collins wrote:
>>> On Tue, 2006-06-27 at 02:55 +0200, Jelmer Vernooij wrote:
>>>> Hi,
>>>>
>>>> WorkingTree.pending_merges() was checking for the wrong exception. This
>>>> exception fixes this and adds a test. 
>>>>
>>>> Modern checkouts, however, will always have a 'pending-merges' file. So
>>>> alternatively, this check could be removed altogether.
>> [...]
>> Fixed in attached bundle.
> Once again, this time _with_ bundle.
> 
> Cheers,
> 
> Jelmer
> 

+1, merged and submitted.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEoos6JdeBCYSNAAMRAoKAAKCW1dbrxAWh/Bt68SqSbWtOeblI7wCgqQub
sCOAxkfHIetj/R55WHzjUtE=
=YxZw
-----END PGP SIGNATURE-----