Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/fancyopts.py @ 346:f69a5d2d4fe1
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-----
| author | mpm@selenic.com |
|---|---|
| date | Wed, 15 Jun 2005 00:27:20 -0800 |
| parents | 11d64332a1cb |
| children | 03f27b1381f9 |
comparison
equal
deleted
inserted
replaced
| 345:9d8d9207c0b3 | 346:f69a5d2d4fe1 |
|---|