[PATCH 0/2] D/F conflicts fixes.

I'll be sending these two patches.

    [PATCH 1/2] Add more tests for read-tree --emu23.
    [PATCH 2/2] Fix oversimplified optimization for add_cache_entry().