Mon, 07 Apr 2014 02:12:28 +0200 | Mads Kiilerich | merge: let manifestmerge emit 'keep' actions when keeping wd version | changeset | files |
Sun, 06 Apr 2014 13:39:51 +0200 | Mads Kiilerich | merge: pass merge ancestor to calculateupdates as a list | changeset | files |
Sun, 06 Apr 2014 13:39:51 +0200 | Mads Kiilerich | merge: move ancestor selection tweaking from manifestmerge to update function | changeset | files |