From 88c61dea00a273c3ccaefdbd064bab23fd9f697c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 13 Aug 2019 13:36:52 -0400 Subject: [PATCH] typo --- Command/Merge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/Merge.hs b/Command/Merge.hs index b546f91e27..79d028ec83 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -41,4 +41,4 @@ mergeSyncedBranch = mergeLocal mergeConfig def =<< getCurrentBranch mergeBranch :: Git.Ref -> CommandStart mergeBranch r = starting "merge" (ActionItemOther (Just (Git.fromRef r))) $ do currbranch <- getCurrentBranch - nest $ merge currbranch mergeConfig def Git.Branch.ManualCommit r + next $ merge currbranch mergeConfig def Git.Branch.ManualCommit r