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

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

Browse source 
forgot to add it to the merge function
This commit is contained in:
Joey Hess 2019-12-20 10:55:23 -04:00
parent f07cb76640
commit ce3fb0b2e5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Types/GitConfig.hs
View file

@ -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