| commit | be2fda7a60f31f8244300775a2ae2d25e733ac6e | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Fri Apr 21 09:11:09 2023 -0700 |
| committer | Daniel Borkmann <daniel@iogearbox.net> | Mon Apr 24 10:23:12 2023 +0200 |
| tree | 5b4532837731a6b644502d9a08fd3c84c3fac7aa | |
| parent | 9bf25bbf6f75970b3d8c3d9468452d1221f4bb21 [diff] |
pw-pull: Match on conflicts in more lines I'm not sure what changed, maybe the new git version (2.38.1) but the "conflicts" line is now 6th instead of 5th, so it's no longer caught. Give use more lines, we just want to avoid matching on the entire output, because some files may be called "conflicts"... Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>