diff tests/test-pull @ 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 ad3d5b4367cb
children 2d545b98a7bc
line wrap: on
line diff