On Thu, May 24, 2018 at 01:36:57PM +0200, Michal Hocko wrote: > `git commit' fails on a newly added file with the following > * > * You have some suspicious patch lines: > * > * In Documentation/core-api/gfp_mask-from-fs-io.rst > * unresolved merge conflict (line 27) > Documentation/core-api/gfp_mask-from-fs-io.rst:27:=======
This message isn't generated by git itself, but rather by a pre-commit hook. You can skip the hook by running "git commit --no-verify". As for the false positive in the hook logic, I can't say more without having seen the hook source. :) Do you know where you got it from? (Googling for "suspicious patch lines" turns up some hits, but with varying provenance). -Peff
