diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:22 -0700 |
| commit | 2435feaa207eb3256dda978654b2a4308cdbd446 (patch) | |
| tree | 136a6179216f388ce66a9c85145c620a6bda0231 /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'jk/open-dotgitx-with-nofollow' (diff) | |
| parent | convert: fail gracefully upon missing clean cmd on required filter (diff) | |
| download | tgif-2435feaa207eb3256dda978654b2a4308cdbd446.tar.xz | |
Merge branch 'mt/cleanly-die-upon-missing-required-filter'
We had a code to diagnose and die cleanly when a required
clean/smudge filter is missing, but an assert before that
unnecessarily fired, hiding the end-user facing die() message.
* mt/cleanly-die-upon-missing-required-filter:
convert: fail gracefully upon missing clean cmd on required filter
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions