diff-files: show unmerged entries correctly