[MERGE] Fix bug #127115, merge --uncommitted failing on a single commit branch

[Wouter van Heyst]

Hi all,

this basically undoes part of the r2617 to speed up merge by once again
checking if other_rev_id is None.

Wouter van Heyst
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 127115-set-pending.diff
Type: text/x-diff
Size: 3319 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070721/751b8d3f/attachment.bin