Jeff King <peff@xxxxxxxx> writes: > The problem is that merge-one-file simply assumes it is in the root of > the working tree without any checking. It is kind of surprising that there was only one place that you needed to touch ;-). Thanks. -- 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