From 2d0a05c0fee218320e2a2183fed6cf974894ec7f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Nov 2013 14:18:15 -0400 Subject: [PATCH] add a note after successful conflicted merge resolution --- Command/Sync.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/Command/Sync.hs b/Command/Sync.hs index beb1e1a39f..e5ab4cf4b1 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)