[MERGE] #25449

[Talden]

>> Hello,
>>
>> This is a patch for bug 25449:
>>
>> https://bugs.launchpad.net/bzr/+bug/254449
>>
>> It speeds up the error message when merging with uncommitted changes.

> I appreciate your wish to improve the Bazaar user experience, however
> this change is not desired.

Not desired... apparently you don't wait for your merges as long as some 8-o.

It would be a shame if this couldn't be moved forward in some way or
even moved out of sequence (local vs remote activity).

PS: I really must learn Python to see how hard it makes
multi-threading - I've seen it mentioned before...

--
Talden