Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 4360:d5c3a70f8422
polish the simplemerge command; add a test
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |