[PATCH 0/3] Merge leftover bits

This series is a resend of various fixes rediffed against your
HEAD this morning.

    [PATCH 1/3] diff-cache.c compilation warning fix.
    [PATCH 2/3] diff.c: clean temporary files
    [PATCH 3/3] diff-tree-helper: ignore unmerged path outside specification.