Skip to content

Commit

Permalink
Fix pr_merge_main() (#2026)
Browse files Browse the repository at this point in the history
  • Loading branch information
olivroy authored Jul 25, 2024
1 parent 1f73587 commit 0e773f9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions R/utils-git.R
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ git_conflict_report <- function() {
no <- "No, I want to abort this merge."
choice <- utils::menu(
title = "Do you want to proceed with this merge?",
choices = c(yes, yes_soft, no),
title = msg
choices = c(yes, yes_soft, no)
)

if (choice < 1 || choice > 2) {
Expand Down

0 comments on commit 0e773f9

Please sign in to comment.