]> dgit.raspbian.org Git - git-annex.git/commit
projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f07cb76) | patch
fixed an oversight that had always prevented annex.resolvemerge from being honored...
authorJoey Hess <joeyh@joeyh.name>
Fri, 20 Dec 2019 14:55:23 +0000 (10:55 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 20 Dec 2019 15:00:08 +0000 (11:00 -0400)
commitce3fb0b2e55fce20e2309a7ad3d84b7a061806b6
treefcb00c31f58d011bafc859aa5e83293725844a4ftree | snapshot
parentf07cb7664008c03ad70e8ff52ebfdb29e5303ffecommit | diff
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 diff | blob | history
Config/GitConfig.hs diff | blob | history
Logs/Config.hs diff | blob | history
Types/GitConfig.hs diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.