From f5ec1cf60d1ead41212f90055eb45b86784d2ec8 Mon Sep 17 00:00:00 2001
From: Jakub Kicinski <kuba@kernel.org>
Date: Mon, 8 Feb 2021 18:42:11 -0800
Subject: pw-pull: use three-way merge for git-am

When test-applying a series to see if the contents of the patches
on the mailing list match the PR we can allow -3, this avoids
series application failing while the PR pulls cleanly.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 pw-pull | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pw-pull b/pw-pull
index 7b9bfa3..90dbd3f 100755
--- a/pw-pull
+++ b/pw-pull
@@ -92,7 +92,7 @@ fi
 if [ ! -z "$series" ]; then
     mbox_from_series $series
     git checkout -b $series_branch
-    git am mbox.i
+    git am -3 mbox.i
     rm -f mbox.i
     git checkout master
 fi
-- 
cgit 1.2.3-korg