diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
| commit | 63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66 (patch) | |
| tree | a2f3400ce412aef23e0c53f2e2f415f94d55e2f1 /xdiff/xdiffi.c | |
| parent | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint (diff) | |
| parent | rerere forget: do not segfault if not all stages are present (diff) | |
| download | tgif-63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66.tar.xz | |
Merge branch 'js/rerere-forget-protect-against-NUL' into maint
* js/rerere-forget-protect-against-NUL:
rerere forget: do not segfault if not all stages are present
rerere forget: grok files containing NUL
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions