From 8f380cd51dd41d403557baf905abb74e5af32f5d Mon Sep 17 00:00:00 2001
From: Terry Kong <terryk@nvidia.com>
Date: Wed, 1 Nov 2023 16:27:07 -0700
Subject: [PATCH] switch to --3way since that produces a merge conflict to help
 understand the conflict

---
 rosetta/create-distribution.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rosetta/create-distribution.sh b/rosetta/create-distribution.sh
index db375ea16..14e6da66e 100755
--- a/rosetta/create-distribution.sh
+++ b/rosetta/create-distribution.sh
@@ -198,14 +198,14 @@ am+record() {
     exit 1
   fi
   # Apply the patch
-  git am <$patch_path || ret_code=$?
+  git am --3way <$patch_path || ret_code=$?
   if [[ ${ret_code:-0} -ne 0 ]]; then
     cat <<EOF
 [ERROR]: Tried patching commits from $patch_path, but failed:
 ==== git status ====
 $(git status)
-==== git am --show-current-patch=diff ====
-$(git am --show-current-patch=diff)
+==== git diff ====
+$(git diff)
 ==================
 EOF
     exit 1