| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add merge action 'p' to record path conflicts during update | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add pathconflict merge state | file | diff | annotate |
| Sun, 08 Oct 2017 21:48:40 +0200 | Boris Feld | configitems: register 'merge.checkunknown' and 'merge.checkignored' | file | diff | annotate |