log tests/test-resolve.t @ 14799:1b7f1348439e

age author description
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
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'
Mon, 30 Aug 2010 14:06:18 +0900 Nicolas Dumazet tests: unify test-resolve base tests/test-resolve@09ba722b4f14