From 12812225b5bc7d8b54722c6b4082e5e753a4ff3f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Nov 2013 14:18:15 -0400 Subject: add a note after successful conflicted merge resolution --- Command/Sync.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'Command') 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) -- cgit v1.2.3