Thomas Ackermann wrote: >> Maybe the intent is >> >> Git can help you perform a three-way merge, which can in turn be [...] > If you don't mind I will use your text No problem. Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> -- 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