Andrew's git / gitweb.git / diff
?
Merge branch 'js/rerere-forget-protect-against-NUL'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:02 +0000 (17:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:02 +0000 (17:41 -0700)
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

Trivial merge