Mercurial > hg
log tests/test-merge-local.t @ 29172:2ea9c9aa6e60
| age | author | description |
|---|---|---|
| Mon, 07 Dec 2015 20:43:24 -0800 | Martin von Zweigbergk | merge: refuse update/merge if there are unresolved conflicts (BC) |
| Tue, 10 Nov 2015 16:25:59 -0800 | Christian Delahousse | filemerge: choose where .orig files are kept |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| 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 |
| Sat, 11 Sep 2010 21:19:12 +0200 | Adrian Buehlmann | tests: unify test-merge-local base tests/test-merge-local@dc6270a9c384 |