.hgtags
author mpm@selenic.com
Wed, 15 Jun 2005 00:27:20 -0800
changeset 346 f69a5d2d4fe1
parent 194 4ec26766be83
child 458 ff8fbf99cd64
permissions -rw-r--r--
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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
66
5ec8b2ed858f Beginnings of changelog tagging
mpm@selenic.com
parents:
diff changeset
     1
d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f
5ec8b2ed858f Beginnings of changelog tagging
mpm@selenic.com
parents:
diff changeset
     2
1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e
5ec8b2ed858f Beginnings of changelog tagging
mpm@selenic.com
parents:
diff changeset
     3
7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d
5ec8b2ed858f Beginnings of changelog tagging
mpm@selenic.com
parents:
diff changeset
     4
b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c
189
37625132fe37 Add tag for 0.5
mpm@selenic.com
parents: 66
diff changeset
     5
f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5
194
4ec26766be83 Update tags
mpm@selenic.com
parents: 189
diff changeset
     6
0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b