Mercurial > hg-stable
log tests/test-conflict.t @ 18987:3605d4e7e618
age | author | description |
---|---|---|
Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) |
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 |
Thu, 12 Aug 2010 20:02:59 +0900 | Nicolas Dumazet | tests: unify test-conflict base tests/test-conflict@d6cf657d98b8 |