On Wed, Mar 5, 2014 at 1:29 PM, Junio C Hamano <gits...@pobox.com> wrote: > If the user said "git merge" while another "git merge" is still > outstanding, we would want to say "You have not concluded your > previous merge" and die, and you presumably want to add the same > "how to abort" message there. Such a codepath is unlikely to be > covered by existing advice.resolveConflict, and it sounds more > natural, at least to me, to use a separate variable to squelch only > the new "how to abort" part.
Alright, I don't mind using a separate variable. Though I think it'd be good to keep the variable name slightly more general though, like "advice.mergeHints", so that we could use the variable to cover other merge hints in the future as well. Having one advice config/variable for every single situation seems a bit overkill, and we would end up with too many variables. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
