switch to --3way since that produces a merge conflict to help understand

the conflict
NVIDIA · Nov 1, 2023 · 8f380cd · 8f380cd
1 parent deab0c4
commit 8f380cd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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