Added tests for the case of merged and unmerged entries for the same file

Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com>
git update-index --cacheinfo can be used to select a stage when there are merged and unmerged entries

Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com>