From e90660342aaf9e2a2116d58b07dc89ab1c1e3a91 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Fri, 30 Oct 2015 21:40:50 +0800
Subject: [PATCH] Remove nonexistent file from in libgit2.vcxproj

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 ext/build/libgit2.vcxproj         | 1 -
 ext/build/libgit2.vcxproj.filters | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/ext/build/libgit2.vcxproj b/ext/build/libgit2.vcxproj
index 23e8e0e56..058375b17 100644
--- a/ext/build/libgit2.vcxproj
+++ b/ext/build/libgit2.vcxproj
@@ -290,7 +290,6 @@
     <ClInclude Include="..\libgit2\src\khash.h" />
     <ClInclude Include="..\libgit2\src\map.h" />
     <ClInclude Include="..\libgit2\src\merge.h" />
-    <ClInclude Include="..\libgit2\src\merge_file.h" />
     <ClInclude Include="..\libgit2\src\message.h" />
     <ClInclude Include="..\libgit2\src\mwindow.h" />
     <ClInclude Include="..\libgit2\src\netops.h" />
diff --git a/ext/build/libgit2.vcxproj.filters b/ext/build/libgit2.vcxproj.filters
index 7b9e8a1ec..6e7ba46e2 100644
--- a/ext/build/libgit2.vcxproj.filters
+++ b/ext/build/libgit2.vcxproj.filters
@@ -835,9 +835,6 @@
     <ClInclude Include="..\libgit2\src\khash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\libgit2\src\merge_file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\libgit2\src\object.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-- 
2.11.4.GIT