log tests/test-merge7.t @ 12412:2dbb9e5e3454

age author description
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sun, 12 Sep 2010 18:05:53 -0500 Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Thu, 02 Sep 2010 23:22:51 +0200 Martin Geisler tests: remove unneeded -d flags
Wed, 18 Aug 2010 05:54:00 +0530 Pradeepkumar Gayam tests: unify test-merge7 base tests/test-merge7@881279ed37e5