Mercurial > hg > mercurial-crew-with-dirclash
log
age | author | description |
---|---|---|
Thu, 19 Apr 2007 12:47:55 +0200 | Thomas Arendsen Hein | Use python instead of shell printf with \x for test-simplemerge-cmd |
Mon, 16 Apr 2007 20:23:45 -0300 | Alexis S. L. Carvalho | Merge with crew. |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default |
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 |