[MERGE] annotate uncommitted changes

[Aaron Bentley]

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

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.

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

iD8DBQFFiEHA0F+nu1YWqI0RArm5AJsHbqfvTPd+5k01+z7qwW7b/cgE0gCeK+8V
nVS3pHjKoUdfFvMovwxvEXk=
=emQL
-----END PGP SIGNATURE-----