Mercurial > hg
log tests/test-commit-unresolved.t @ 18116:bcee63733aad
| age | author | description |
|---|---|---|
| Mon, 11 Jun 2012 01:40:51 +0200 | Mads Kiilerich | tests: add missing trailing 'cd ..' |
| Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) |
| Sun, 06 Mar 2011 15:21:50 +0100 | Patrick Mezard | Improve unresolved merge conflicts warning (issue2681) stable |
| Fri, 17 Sep 2010 17:03:04 -0500 | Matt Mackall | tests: exit 0 no longer needed on unified tests |
| 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, 12 Aug 2010 22:28:21 +0900 | Nicolas Dumazet | tests: unify test-commit-unresolved base tests/test-commit-unresolved@4b077f714900 |