diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:02 -0700 |
| commit | 5beeefea318593cbfd0425651f2ed60de46016ba (patch) | |
| tree | 2431d2ddfc9f5f92c9657f8b1a8134b748d7906c /hex.c | |
| parent | Merge branch 'po/help-guides' (diff) | |
| parent | rerere forget: do not segfault if not all stages are present (diff) | |
| download | tgif-5beeefea318593cbfd0425651f2ed60de46016ba.tar.xz | |
Merge branch 'js/rerere-forget-protect-against-NUL'
A few bugfixes to "git rerere" working on corner case merge
conflicts.
* 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 'hex.c')
0 files changed, 0 insertions, 0 deletions