Stephan Beyer <s-beyer@xxxxxxx> writes: >> Just being a bit defensive -- in this case I think it might be Ok to say >> "read-tree --reset -u ORIG_HEAD", but I haven't checked in a conflicted >> case. > > Well, the test suite fails: > ... > So no reason to be defensive ;) Ok, so it is not just being defensive but actually is necessary. -- 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
