Hi, 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. 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
