[PATCH 4 of 7 mergedriver] filemerge._picktool: only pick from nomerge tools for change/delete conflicts

[Siddharth Agarwal]

On 11/19/15 14:43, Martin von Zweigbergk wrote:
> Not this patch's fault, but would it make sense to use the same name 
> for the tool path in all three cases instead of "tool", "toolpath" and 
> "hgmerge"?

Yeah, probably, as a followup.