53 commits

Author	SHA1	Message	Date
Joey Hess	b9e4e2ba84	new method for merging changes into adjusted branch that avoids unncessary merge conflicts ... Still needs work when there are actual merge conflicts.	2016-04-06 15:36:18 -04:00
Joey Hess	f9d79d194b	Windows: Fix v6 unlocked files to actually work. ... Pointer files were not being treated as annex content, so "git annex get" didn't replace them with the object.	2016-02-15 16:12:18 -04:00
Joey Hess	737e45156e	remove 163 lines of code without changing anything except imports	2016-01-20 16:36:33 -04:00

Renamed from Locations.hs (Browse further)