unpack-trees: fix oneway_merge accidentally carry over stage index
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"