| Tue, 25 Feb 2014 20:29:46 +0100 | Mads Kiilerich | merge: use the right ancestor when both sides copied the same file | changeset | files |
| Tue, 25 Feb 2014 20:29:14 +0100 | Mads Kiilerich | copies: when both sides made the same copy, report it as a copy | changeset | files |
| Sun, 02 Mar 2014 18:36:02 +0100 | Mads Kiilerich | merge: handle create+delete prompts in calculateupdates | changeset | files |
| Fri, 28 Feb 2014 02:26:03 +0100 | Mads Kiilerich | merge: handle acceptremove of create+delete early in manifest merge | changeset | files |
| Sun, 02 Mar 2014 18:30:41 +0100 | Mads Kiilerich | largefiles: override calculateupdates instead of manifestmerge | changeset | files |
| Tue, 25 Feb 2014 20:28:40 +0100 | Mads Kiilerich | tests: add systematic test of merge ancestor calculation | changeset | files |
| Sun, 02 Mar 2014 18:25:19 +0100 | Mads Kiilerich | tests: add test case for criss cross merge | changeset | files |