Skip to content

Commit b0d9337

Browse files
authored
Apply suggestion from @Phlogistique
1 parent e9ed00b commit b0d9337

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

update-pr-stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ update_direct_target() {
121121
echo "git merge ${CONFLICTS[$i]}"
122122
echo '```'
123123
echo
124-
echo 'If this stops with conflicts, fix them (for instance with `git mergetool`), then run `git commit` before continuing.'
124+
echo 'Fix the conflicts (for instance with `git mergetool`), then run `git commit` before continuing.'
125125
echo
126126
done
127127
echo '```bash'

0 commit comments

Comments
 (0)