log tests/test-conflict @ 464:50da4bb9cab6

age author description
Fri, 17 Jun 2005 08:50:55 -0800 mpm Tidy up conflict and pull tests
Wed, 15 Jun 2005 00:27:20 -0800 mpm merge3: fix argument order