Fredrik Kuivinen [off-list ref] writes:
Thinking a bit more about it, maybe it's better to use a temporary
index file. If go this way we could, at least in principle, allow
merges which starts with a dirty working directory.
Yeah, I like the idea of using temporary index for doing merges
that are not what the user wanted to do. The same idea is used
in the 'stupid' thing that tries to find the least-conflicting
merge base.