Joey Hess ce3fb0b2e5 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		2019-12-20 11:00:08 -04:00
..
Cost.hs	update licenses from GPL to AGPL	2019-03-13 15:48:14 -04:00
DynamicConfig.hs	update licenses from GPL to AGPL	2019-03-13 15:48:14 -04:00
Files.hs	Makefile: Added install-home target which installs git-annex into the HOME directory	2019-03-18 12:36:03 -04:00
GitConfig.hs	fixed an oversight that had always prevented annex.resolvemerge from being honored, when it was configured by git-annex config	2019-12-20 11:00:08 -04:00
Smudge.hs	include git-annex-shell back in	2019-12-02 11:51:52 -04:00