From: Junio C Hamano Date: Fri, 12 Apr 2013 00:41:02 +0000 (-0700) Subject: Merge branch 'js/rerere-forget-protect-against-NUL' X-Git-Tag: v1.8.3-rc0~82 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5beeefea318593cbfd0425651f2ed60de46016ba?ds=inline;hp=--cc 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 --- 5beeefea318593cbfd0425651f2ed60de46016ba