3 commits

Author	SHA1	Message	Date
Joey Hess	251405eca2	avoid withWorkTreeRelated affecting annex symlink calculation	2016-04-08 14:24:00 -04:00
Joey Hess	60bdffe43e	fix auto merge conflict resolution when doing out of tree merge for adjusted branch	2016-04-06 17:32:04 -04:00
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