diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
| commit | 406cc9b822b44a1d53c1a45536460992529aec88 (patch) | |
| tree | 123a7975e84cd1d8fff6feaf2fd92355a4e23fb8 /diff.c | |
| parent | Merge branch 'cn/maint-lf-to-crlf-filter' into maint (diff) | |
| parent | builtin/apply.c: report error on failure to recognize input (diff) | |
| download | tgif-406cc9b822b44a1d53c1a45536460992529aec88.tar.xz | |
Merge branch 'bc/maint-apply-check-no-patch' into maint
* bc/maint-apply-check-no-patch:
builtin/apply.c: report error on failure to recognize input
t/t4131-apply-fake-ancestor.sh: fix broken test
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions