mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add a note after successful conflicted merge resolution

Browse source
This commit is contained in:
Joey Hess 2013-11-14 14:18:15 -04:00
parent b0f7c80378
commit 2d0a05c0fe
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Command/Sync.hs
View file

@ -321,6 +321,7 @@ resolveMerge = do
, Param "-m" , Param "-m"
, Param "git-annex automatic merge conflict fix" , Param "git-annex automatic merge conflict fix"
] ]
showLongNote "Merge conflict was automatically resolved; you may want to examine the result."
return merged return merged
resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath) resolveMerge' :: LsFiles.Unmerged -> Annex (Maybe FilePath)