[MERGE] fix for a namerror in merge sanity checking

Michael Hudson michael.hudson at canonical.com
Wed Aug 1 09:43:28 BST 2007


I have an alias from 'merge' to 'merge --show-base', and while this
means that 'bzr merge --weave' isn't going to work, it shouldn't give a
NameError like it does in bzr.dev.  Fix attached.

Cheers,
mwh
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merge-nameerror.bundle
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070801/8d8928f7/attachment.diff 


More information about the bazaar mailing list