Mercurial > hg > mercurial-crew-with-dirclash
log
age | author | description |
---|---|---|
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | polish the simplemerge command; add a test |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | actually port simplemerge to hg |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | Import 3-way merge code from bzr |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | add mdiff.get_matching_blocks |