> With this change, it would seem to be more logical to ask whether the > merge tool is to be run before creating the temporary files, removing > the need for them to be cleaned up if the answer is no. I think that > this would be cleaner overall. I agree, but to be honest, I couldn't get the logic wrapped around my head, so I did it this way. refactoring does seem to be the best idea, but I don't understand enough of it yet to do so. -- Caleb Cushing http://xenoterracide.blogspot.com -- 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
