Phil Hord <phil.hord@xxxxxxxxx> writes: > On Thu, Jan 24, 2013 at 2:54 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> Phil Hord <hordp@xxxxxxxxx> writes: >> ... >>> These temporary files should not remain after the mergetool operation is >>> completed. >> >> Aren't there cases where people "abort" so that they can have a >> chance inspect them outside mergetool program? If there are no such >> cases, then I would agree with your claim "should not remain", but >> the proposed log message does not explay why it is sure that there >> are no such use cases. > > You may be right about other people's workflows which I forgot to > consider. I have noticed a lot of inconsistency in this tool wrt to > mergetool.keepBackup and mergetool.keepTemporaries. Perhaps this > change should hinge on the latter. > > Would you agree with this rephrased statement (accompanied by matching logic)? > > When mergetool.keepTemporaries is false or not set, these temporary files > should not remain when the mergetool operation is aborted. That is perfectly sensible (and should apply equally to non-"abort" cases, I think). Thanks. -- 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