mergetools / vimdiff2on commit unpack-trees: fix oneway_merge accidentally carry over stage index (ab5af82)
   1. "$MERGE_TOOLS_DIR/vimdiff"