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>

1 files changed, 1 insertions, 1 deletions

diff --git a/pw-pull b/pw-pull
index 877bc1f..c12c795 100755
--- a/pw-pull
+++ b/pw-pull
@@ -102,7 +102,7 @@ fi
 git pull --stat --log --no-edit --no-ff $pull_url
 if [ $? -ne 0 ]; then
     bold "Waiting for conflict resolution..."
-    while git status | head -5 | grep "conflicts" >/dev/null; do
+    while git status | head -9 | grep "conflicts" >/dev/null; do
 	sleep 0.25
     done
 fi