0.18: checking removes files automatically?

[Aaron Bentley]

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

Andrew King wrote:
>> He doesn't know if he added them inadvertently or they are being added
>> in the merge.

If you have uncommitted changes (e.g. newly-added files) in your tree,
merge will refuse to operate, unless you --force it.

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

iD8DBQFGyk+U0F+nu1YWqI0RAtiUAJ9MzwwFVKTnmwP9SAwk8jr8eqAAbQCbBMuK
DcGkv1Xx8q9UIFdDiln9aN4=
=F9Ue
-----END PGP SIGNATURE-----