diff options
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index beb1e1a39..e5ab4cf4b 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -321,6 +321,7 @@ resolveMerge = do , Param "-m" , Param "git-annex automatic merge conflict fix" ] + showLongNote "Merge conflict was automatically resolved; you may want to examine the result." return merged resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath) |