diff.c: return filepair from diff_unmerge()