diff options
Diffstat (limited to 'Command/ResolveMerge.hs')
-rw-r--r-- | Command/ResolveMerge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 8742a1104..0ba6efb36 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -33,8 +33,8 @@ start = do ( do void $ commitResolvedMerge Git.Branch.ManualCommit next $ next $ return True - , error "Merge conflict could not be automatically resolved." + , giveup "Merge conflict could not be automatically resolved." ) where - nobranch = error "No branch is currently checked out." - nomergehead = error "No SHA found in .git/merge_head" + nobranch = giveup "No branch is currently checked out." + nomergehead = giveup "No SHA found in .git/merge_head" |