[MERGE REVIEW] merge takes --uncommitted

[Aaron Bentley]

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

Martin Pool wrote:
> Thanks very much.  +1 from me, with John's comments and a couple more:
> 
> - should be an entry in the NEWS

Okay.

> - because this adds a new user-visible feature, I'd like there to be at
>   least a stub in the manual describing it.

Okay, what do you mean by 'the manual'?

> With those, please merge.

It's already merged, but I'm happy to update it.

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

iD8DBQFE4Hd60F+nu1YWqI0RAtpnAKCGVhjEDzMkjDUYI8LtK+3KU0mI1wCfbL1Z
aBpTM6iDDp24dL3DBLAYAUc=
=uyIc
-----END PGP SIGNATURE-----