| Tue, 14 Aug 2018 22:20:28 +0900 | FUJIWARA Katsunori | filemerge: show actual capabilities of internal merge tools | file | diff | annotate |
| Wed, 15 Aug 2018 22:24:50 +0900 | FUJIWARA Katsunori | filemerge: add config knob to check capabilities of internal merge tools | file | diff | annotate |
| Wed, 15 Aug 2018 22:24:38 +0900 | FUJIWARA Katsunori | filemerge: show warning if chosen tool has no binary files capability | file | diff | annotate |
| Tue, 14 Aug 2018 20:15:51 +0900 | FUJIWARA Katsunori | filemerge: add the function to examine a capability of a internal tool | file | diff | annotate |
| Tue, 14 Aug 2018 20:08:27 +0900 | FUJIWARA Katsunori | filemerge: set actual capabilities of internal merge tools | file | diff | annotate |
| Mon, 23 Jul 2018 22:51:53 -0700 | Martin von Zweigbergk | mergetool: warn if ui.merge points to nonexistent tool | file | diff | annotate |
| Thu, 26 Jul 2018 17:11:03 -0700 | Kyle Lippincott | resolve: add option to warn/abort on -m with unresolved conflict markers | file | diff | annotate |