Fix errors when comparing directories with non-directories. (Closes: #835641)

We now display a nicer diff such as:

  --- /etc/cron.d/
  +++ /etc/fstab
  @@ -1 +1 @@
  -type: directory
  +type: file

Signed-off-by: Chris Lamb <lamby@debian.org>