Hi, On Wed, 18 Jun 2008, Johannes Schindelin wrote: > On Tue, 17 Jun 2008, Junio C Hamano wrote: > > > No, neither --theirs nor --ours option exists in your version of git. > > But here is a patch to add it to git-merge-file. > > Looks good, thanks! Just to be safe, this should be accompanied by tet > cases. But I did not see anything wrong with the patch. Thinking about this again, there could be a problem: in case of complex merges, it is possible that the sides are switched around for an intermediate merge. IOW you'd expect it to take "theirs", but it really takes "ours". Hrm. 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
