| Mon, 30 Nov 2015 10:03:21 -0800 | Siddharth Agarwal | mergestate: add a cached property accessor for the local context | file | diff | annotate |
| Mon, 30 Nov 2015 10:05:09 -0800 | Siddharth Agarwal | mergestate: raise exception if otherctx is accessed but _other isn't set | file | diff | annotate |
| Mon, 23 Nov 2015 18:03:25 -0800 | Siddharth Agarwal | mergestate: explicitly forget 'dc' conflicts where the deleted side is picked | file | diff | annotate |