[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p