From d9ace5f9fce0d4eb76b43521a6848efef643ca8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Rubinstein?= Date: Tue, 3 Feb 2026 11:05:56 +0100 Subject: [PATCH] Fix backtick quoting in conflict resolution instructions The double quotes caused backticks around `git mergetool` to be interpreted as command substitution rather than displayed literally in the output. Co-Authored-By: Claude Opus 4.5 --- update-pr-stack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-pr-stack.sh b/update-pr-stack.sh index f0230ef..cb68595 100755 --- a/update-pr-stack.sh +++ b/update-pr-stack.sh @@ -99,7 +99,7 @@ update_direct_target() { for conflict in "${CONFLICTS[@]}"; do echo "git merge $conflict" echo "# ..." - echo "# fix conflicts, for instance with `git mergetool`" + echo '# fix conflicts, for instance with `git mergetool`' echo "# ..." echo "git commit" done