> This looks like the stack trace in > https://github.com/git-for-windows/git/issues/952, which was fixed by > Johannes Schindelin in commit > 55e9f0e5c ("merge-recursive: handle NULL in add_cacheinfo() > correctly", 2016-11-26). Could you retry with a newer version of git? A newer version (2.14.2 from Debian stretch-backports) fixes the issue. I can now do my cherry-pick. Thank you!
