[MERGE REVIEW] merge takes --uncommitted

[Aaron Bentley]

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

Aaron Bentley wrote:
> Martin Pool wrote:
> 
>>>I think it'd be good to bring in, though perhaps we can unify it with
>>>something else.  Perhaps 'merge --uncommitted'?  Obviously it doesn't
>>>generate a merge record but in other ways it might be similar?
> 
> 
> That's easy as pie.  Bundle attached.

Wrong bundle.  Here.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFE2hCj0F+nu1YWqI0RAlGIAJ403CHruCgIYg7KIyQvjbIzi53ZKACbBTAG
Adja95IUKT93bcTLqjWhhG4=
=OUkx
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-uncommitted.patch
Type: text/x-patch
Size: 4166 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060809/8e365cb6/attachment.bin