Hi, On Sat, 8 Mar 2008, Clemens Buchacher wrote: > I do not understand why, but this does not happen if the file > permissions are the same. I think this is the biggest problem. > t/t6031-merge-recursive.sh | 23 +++++++++++++++++++++++ > xdiff/xmerge.c | 30 ++++++++++++++---------------- ... because xdiff/xmerge.c is definitely the wrong place to "fix" this issue. xdl_merge() does not even _know_ about permissions. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
