diff options
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r-- | Command/Merge.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 5d6b2ffd2..31db7a99f 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -34,6 +34,5 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do - branch <- inRepo Git.Branch.current prepMerge - maybe stop mergeLocal branch + mergeLocal =<< inRepo Git.Branch.current |