diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:56:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:56:22 -0800 |
| commit | b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5 (patch) | |
| tree | 5104d722f0547044c3f129bc49f866aa7498d114 /userdiff.c | |
| parent | 424f30a5ae3ff26fca14df71cce31b06d1dec919 (diff) | |
| parent | cc64b318f26c9e176c4f07b1a459a86e7a04c4eb (diff) | |
| download | git-b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5.tar.gz git-b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5.tar.xz | |
Merge branch 'bc/maint-apply-check-no-patch'
* 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 'userdiff.c')
0 files changed, 0 insertions, 0 deletions