unpack-trees: fix oneway_merge accidentally carry over stage index
[git] / t / t5100 / msg0016
1 and some content
2