Jeff King <peff@xxxxxxxx> writes: > But I think there are two questions: > > 1. Should am's 3-way fallback be made more easily available to users > of regular "apply"? > > 2. Short of doing a 3-way merge, are there better ways to represent > failed hunks in the patch target itself, rather than saving ".rej" > files? > > I'm actually not sure which one Ori was asking about. Me neither, but if I have to guess it would be the former. If there were a solution better than ".rej" in 2-way context, surely "patch" would have implemented it 10 years before we started ;-). -- 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