Mercurial > hg
log tests/test-merge-revert2.t @ 28945:05982f7ab231
| age | author | description |
|---|---|---|
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Mon, 26 May 2014 11:44:58 -0700 | Pierre-Yves David | merge: drop the quotes around commit description |
| Fri, 09 May 2014 18:09:11 -0700 | Durham Goode | update: specify custom conflict markers for update (BC) |
| Thu, 08 May 2014 16:50:22 -0700 | Durham Goode | merge: add conflict marker formatter (BC) |
| 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 |
| Tue, 14 Sep 2010 12:20:51 +0200 | Adrian Buehlmann | combine tests base tests/test-merge-revert2@25ecad8e75c5 |