Junio C Hamano 7479ca4b44 Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint ...

Fix a corner case in merge-recursive regression that crept in
during 2.10 development cycle.

* jc/renormalize-merge-kill-safer-crlf:
  convert: git cherry-pick -Xrenormalize did not work
  merge-recursive: handle NULL in add_cacheinfo() correctly
  cherry-pick: demonstrate a segmentation fault

2017-01-17 14:49:28 -08:00

40 KiB

Raw Blame History

View Raw