compat / msvc.con commit unpack-trees: fix oneway_merge accidentally carry over stage index (ab5af82)
   1#include "../git-compat-util.h"
   2#include "win32.h"
   3#include <conio.h>
   4#include "../strbuf.h"
   5
   6#include "mingw.c"