fixed an oversight that had always prevented annex.resolvemerge from being honored, when it was configured by git-annex config

forgot to add it to the merge function

CHANGELOG

@@ -5,6 +5,8 @@ git-annex (7.20191219) UNRELEASED; urgency=medium
     like get also sped up in cases where they have to check a lot of
     files but only transfer a few files. Speedups range from 30-100%.
   * Added build dependency on the filepath-bytestring library.
+  * Fixed an oversight that had always prevented annex.resolvemerge
+    from being honored, when it was configured by git-annex config.
 
  -- Joey Hess <id@joeyh.name>  Wed, 18 Dec 2019 15:12:40 -0400
 

Config/GitConfig.hs

@@ -15,7 +15,10 @@ import Logs.Config
 
 {- Gets a specific setting from GitConfig. If necessary, loads the
  - repository-global defaults when the GitConfig does not yet 
- - have a value. -}
+ - have a value.
+ -
+ - Note: Be sure to add the config value to mergeGitConfig.
+ -}
 getGitConfigVal :: (GitConfig -> Configurable a) -> Annex a
 getGitConfigVal f = do
 	v <- f <$> Annex.getGitConfig

Logs/Config.hs

@@ -46,6 +46,7 @@ unsetGlobalConfig name = do
 		setGlobalConfig' name (ConfigValue mempty)
 
 -- Reads the global config log every time.
+-- It's more efficient to use Config.GitConfig.
 getGlobalConfig :: ConfigKey -> Annex (Maybe ConfigValue)
 getGlobalConfig name = M.lookup name <$> loadGlobalConfig
 

Types/GitConfig.hs

@@ -221,6 +221,7 @@ mergeGitConfig :: GitConfig -> GitConfig -> GitConfig
 mergeGitConfig gitconfig repoglobals = gitconfig
 	{ annexAutoCommit = merge annexAutoCommit
 	, annexSyncContent = merge annexSyncContent
+	, annexResolveMerge = merge annexResolveMerge
 	}
   where
 	merge f = case f gitconfig of