diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:24 -0700 |
| commit | cec3e186f7b76cdced54286ef1da42b6978c4c8d (patch) | |
| tree | 8e7ca592b5e92112c30b940b5ef8242a3fa48a38 /mergetools/ecmerge | |
| parent | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint (diff) | |
| parent | fix "git apply --index ..." not to deref NULL (diff) | |
| download | tgif-cec3e186f7b76cdced54286ef1da42b6978c4c8d.tar.xz | |
Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint
* jm/maint-apply-detects-corrupt-patch-header:
fix "git apply --index ..." not to deref NULL
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions