[MERGE] Added option --remember to merge command

[Aaron Bentley]

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

Olaf Conradi wrote:

| revision 1597 has the test case

+1

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

iD8DBQFEIz920F+nu1YWqI0RAoonAJ93d6Zn7Ty7ddM8SWyG/apuF7+TwwCeLl/F
452xbNR7ory4zLH9fcOcTEw=
=DU84
-----END PGP SIGNATURE-----