Mercurial > hg
log tests/test-merge9.t @ 29281:9ac309946df9
| age | author | description |
|---|---|---|
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Fri, 25 Sep 2015 03:51:46 -0400 | timeless | resolve: consistently describe re-merge + unresolved |
| Thu, 24 Jul 2014 14:29:08 -0700 | Nathan Goldbaum | resolve: report no argument warning using a hint stable |
| 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) |
| Mon, 20 Sep 2010 16:00:15 -0500 | Matt Mackall | tests: drop final true command from unified tests |