[MERGE REVIEW]

[Aaron Bentley]

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

This patch adds support for specifying a single file to merge, by
appending it to the branch name.

This also means that you'll get a good error if you improperly specify a
branch.  For example, if you're in bzr.dev/bzrlib and type 'bzr merge
../bzr.ab', it will complain that bzr.dev has no file "bzr.ab".

The branch is at http://code.aaronbentley.com/bzr/bzrrepo/mergeui/

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

iD8DBQFEOKtX0F+nu1YWqI0RAr3dAJ9sLfPGFAkPgD2PqyLTfojC/pmKPgCfY7oK
Iw/F4Q37XluLn04aZ0n6uFc=
=UMDt
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge_one.patch
Type: text/x-patch
Size: 3153 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060409/7ab81635/attachment.bin