Cleaned up show_changeset() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up show_changeset() manifest hash: f9aa30cfa465d7aa096abb652ec04f1a5ec1072f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCroC+W7P1GVgWeRoRAuheAJsEx7eFaoHoz+YejLIiN4BSfE117ACfYdM6 NQGNTp3ftUSuVpcMLvV8A1U= =8Ihb -----END PGP SIGNATURE-----

merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----