difftool: handle unmerged files in dir-diff mode