vendor/libgit2/src/checkout.c in rugged-0.23.2 vs vendor/libgit2/src/checkout.c in rugged-0.23.3

@@ -16,19 +16,20 @@
 #include "git2/config.h"
 #include "git2/diff.h"
 #include "git2/submodule.h"
 #include "git2/sys/index.h"
 #include "git2/sys/filter.h"
+#include "git2/merge.h"
 
 #include "refs.h"
 #include "repository.h"
 #include "index.h"
 #include "filter.h"
 #include "blob.h"
 #include "diff.h"
 #include "pathspec.h"
 #include "buf_text.h"
-#include "merge_file.h"
+#include "diff_xdiff.h"
 #include "path.h"
 #include "attr.h"
 #include "pool.h"
 #include "strmap.h"