On 2007-03-01 03:03:11 -0800, Junio C Hamano wrote: > ; takes temporary files old, mine, his and writes the > ; result in another > merge = "cmd external-merge-command %s %s %s %s" Better make this "%1 %2 %3 %4", "%old %mine %his %result", or something along those lines, so as to not force a particular argument order on the external script. -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle - 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