> Isn't what Caleb wants "-X ours/theirs" per-hunk option for merge strategy backends? just from this description it sounds like it. I can't say anything about that patch, but to me having such a strategy only makes sense. -- Caleb Cushing -- 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
