Merge pull request #4687 from tiennou/fix/4672 patch_parse: populate line numbers while parsing diffs