Jay Soffian <jaysoffian@xxxxxxxxx> writes: > For that matter, I don't see how to distinguish "the merge did not > even start" from "the merge had conflicts" when using > try_merge_command(). I suspect you figured it out by now (sorry I have been tending other topics and general project maintenance issues), but in case you haven't, the exit values from the strategy backends are returned straight back to the caller. The strategy backends are supposed to exit with 1 when they left the conflicts, and 2 when they punted and did not touch the index nor the working tree. -- 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