Petr Baudis <pasky@suse.cz> writes: > Well, the recursive merge strategy is at least advertised to be able to > merge across renames (as long as they are autodetected). Not that I > would have any practical experiences with it and I don't know how smart > is it done (if it just runs rename detection between the merge base and > current head, yes, that might not give very good results in this case). If I understand and remember the code correctly, it is based on rename detection between two heads. When the versions have diverged greatly beyond recognition, obviously this would not work well. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Jan 19 04:35:17 2006
This archive was generated by hypermail 2.1.8 : 2006-01-19 04:35:27 EST