| Mon, 27 Feb 2017 14:27:22 -0800 | Martin von Zweigbergk | merge: drop obsolete non-linear cases from docstring table | file | diff | annotate |
| Thu, 09 Feb 2017 09:52:32 -0800 | Martin von Zweigbergk | destutil: remove duplicate check and leave it to merge.update() | file | diff | annotate |
| Thu, 09 Feb 2017 09:55:31 -0800 | Martin von Zweigbergk | update: fix typo/stale comment to match code | file | diff | annotate |
| Wed, 08 Feb 2017 23:03:33 -0800 | Martin von Zweigbergk | merge: remove unused handling of default destination in merge.update() | file | diff | annotate |
| Wed, 08 Feb 2017 14:49:37 -0800 | Martin von Zweigbergk | update: localize logic around which ancestor to use | file | diff | annotate |
| Wed, 01 Feb 2017 02:10:30 +0100 | Mads Kiilerich | merge: more safe detection of criss cross merge conflict between dm and r | file | diff | annotate |