diff: remove often unused parameters from diff_unmerge()