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 |
Tue, 31 Jan 2017 03:25:59 +0100 | Mads Kiilerich | merge: fix crash on criss cross merge with dir move and delete (issue5020) | file | diff | annotate |