diff --dirstat: saner handling of binary and unmerged files