| Mon, 21 Apr 2014 20:22:14 +0200 | Mads Kiilerich | merge: fix stray character in bid merge message | file | diff | annotate |
| Mon, 21 Apr 2014 19:53:19 +0200 | Mads Kiilerich | merge: fix wrong number of arguments for bid merge message | file | diff | annotate |
| Mon, 21 Apr 2014 15:08:39 -0500 | Matt Mackall | merge: fix test failures with new merge code on OS X | file | diff | annotate |
| Fri, 28 Feb 2014 02:52:32 +0100 | Mads Kiilerich | merge: with merge.preferancestor=*, run an auction with bids from ancestors | file | diff | annotate |
| Mon, 07 Apr 2014 02:12:28 +0200 | Mads Kiilerich | merge: let manifestmerge emit 'keep' actions when keeping wd version | file | diff | annotate |
| Sun, 06 Apr 2014 13:39:51 +0200 | Mads Kiilerich | merge: pass merge ancestor to calculateupdates as a list | file | diff | annotate |