Hi, On Wed, Apr 8, 2009 at 12:35 PM, layer <layer@xxxxxxxxx> wrote: <snip> >>> git merge-file current-sock other-sock base-sock > > Did you mean this? > > git merge-file current-sock base-sock other-sock > > The man page seems to indicate that. Oops, yeah, current then base then other, like the manpage says. -- 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