author | Matt Mackall <mpm@selenic.com> |
Mon, 23 Jul 2007 20:44:08 -0500 | |
changeset 4993 | 4205f626dc05 |
parent 4364 | d5c3a70f8422 |
child 5081 | ea7b982b6c08 |
permissions | -rw-r--r-- |
4364
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
(binary:application/octet-stream) |