[MERGE] Fix missing pending merges

[Robert Collins]

On Tue, 2006-06-27 at 10:51 +0200, 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.

+1. 

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060627/36d28175/attachment.pgp