author | Matt Mackall <mpm@selenic.com> |
Sat, 21 Jul 2007 16:02:09 -0500 | |
changeset 4957 | 46e39935ce33 |
parent 4360 | d5c3a70f8422 |
child 5115 | ea7b982b6c08 |
permissions | -rw-r--r-- |
4360
d5c3a70f8422
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
(binary:application/octet-stream) |