pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pic...