Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-conflict.out @ 493:30752b14f759
age | author | description |
---|---|---|
Fri, 17 Jun 2005 08:50:55 -0800 | mpm | Tidy up conflict and pull tests |
Wed, 15 Jun 2005 21:13:49 -0800 | mpm | Merge with TAH |
Wed, 15 Jun 2005 21:12:28 -0800 | mpm | update tests to reflect new short hash length |
Wed, 15 Jun 2005 00:27:20 -0800 | mpm | merge3: fix argument order |