diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:18 -0800 |
| commit | ee438efbc1a05382fa6f2ab59e7d07240a5013be (patch) | |
| tree | 2a0a571446019e49e3e573c3214d9fa4d04d3f40 /ll-merge.h | |
| parent | Merge branch 'jk/push-progress' (diff) | |
| parent | apply: don't segfault on binary files with missing data (diff) | |
| download | tgif-ee438efbc1a05382fa6f2ab59e7d07240a5013be.tar.xz | |
Merge branch 'jk/maint-apply-no-binary'
* jk/maint-apply-no-binary:
apply: don't segfault on binary files with missing data
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions