[MERGE][136890] ``merge --uncommitted`` with a path to a specific file should merge only that file

[Lukáš Lalinský]

Hi,

this is a fix for https://bugs.launchpad.net/bzr/+bug/136890 -- in
short, if the --uncommitted option is specified and the location points
to a file inside a branch, all changed files from the branch are merged,
not just the single file.

Lukas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-QIasZP.patch
Type: text/x-patch
Size: 4751 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070907/d668e0b1/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
	=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
	=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070907/d668e0b1/attachment.pgp