Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-simplemerge.py @ 4579:4500fbe3a432
age | author | description |
---|---|---|
Wed, 06 Jun 2007 20:22:52 +0200 | Thomas Arendsen Hein | Removed trailing whitespace and tabs from python files |
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 |