diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-02 15:29:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-02 15:29:38 -0400 |
| commit | 8cff4865d3bee469742538c23d1e16e67cadd9cb (patch) | |
| tree | c1bc15a14fe51b0f4a69e3fe5e33e2858ac9a88c /Command/Merge.hs | |
| parent | 95e946a21e1960c9dcf63ad579c58434746295b2 (diff) | |
sync: Work even when the local git repository is new and empty, with no master branch.
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 |