On Thu, Apr 23, 2015 at 01:01:44PM -0700, Junio C Hamano wrote: > One of the first things cmd_merge() does is to see if the "--abort" > option is given and run "reset --merge" and exit. When the control > reaches this point, we know "--abort" was not given. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> Yeah, this looks obviously correct. As an aside, the fact that the actual "if (abort_current_merge)" conditional ends with a "goto" to a cleanup label that is 500 lines away is...kind of gross. -Peff -- 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