Hmm, my knee-jerk reaction was that something may be keying off of the conflict ids to keep track of which ones are dealt with and which ones are yet to be resolved, but I don't recall any part of the implementation that would do something like that offhand. Sorry. Will try to find/make time to take a look at it later. -- 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