diff options
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index b673a5e6f..a332596f6 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -111,10 +111,10 @@ resolveMerge us them = do void $ liftIO cleanup2 when merged $ do + Annex.Queue.flush unlessM isDirect $ do unstagedmap <- inodeMap $ inRepo $ LsFiles.notInRepo False [top] cleanConflictCruft mergedks' mergedfs' unstagedmap - Annex.Queue.flush showLongNote "Merge conflict was automatically resolved; you may want to examine the result." return merged |