[MERGE] annotate uncommitted changes

[David Allouche]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
> 
>>> To start with, I really like the idea, especially that you can annotate
>>> the working files to get where lines came from even from merged parents.
> 
> You know, I thought that was essentially a "for-completeness" feature,
> but just yesterday, I used it to help me sort out a merge conflict.

Wooo-hooo!

Does this mean that now you can get annotated fishbones conflicts?

I remember a few weeks ago I had a discussion where I mentioned this as
something that would be really cool to have.

-- 
                                                            -- ddaa

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061222/40838439/attachment.pgp