Allow index entries to be merged

When cherry-picking commits, the possibility exists that the commit being picked is based of a renamed file. This will always result in a conflict.

Manually merging the index entries is a building block to auto-resolve the above scenario.