| commit | 5beeefea318593cbfd0425651f2ed60de46016ba | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Apr 2013 00:41:02 +0000 (11 17:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Apr 2013 00:41:02 +0000 (11 17:41 -0700) | ||
| tree | 2431d2ddfc9f5f92c9657f8b1a8134b748d7906c | treesnapshot (tar.gz zip) |
| parent | b3569933dd8962e79ce5e1232f06a9b74026b762 | commitdiff |
| parent | b9e31f59478eeae3e4230308f6fc06713c6fc547 | commitdiff |
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
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