diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:15 +0900 |
| commit | f72e075e300cd4fb74adf61d574fd2125c37e2eb (patch) | |
| tree | 381df80a5887425bf99bfefad2dade17908a9fa5 /builtin/difftool.c | |
| parent | Merge branch 'ab/sha1dc-maint' into maint (diff) | |
| parent | am: handle "-h" argument earlier (diff) | |
| download | tgif-f72e075e300cd4fb74adf61d574fd2125c37e2eb.tar.xz | |
Merge branch 'jk/unbreak-am-h' into maint
"git am -h" triggered a BUG().
* jk/unbreak-am-h:
am: handle "-h" argument earlier
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions