merge-recursive: Cleanup and consolidation of rename_conflict_info

diff --git a/compat/winansi.c b/compat/winansi.c
index 9217c24b43f7546815079d540304aa71821df926..dedce2104eaf5cefbb1abef1b7921eb99c67a75e 100644 (file)
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -2,7 +2,6 @@
  * Copyright 2008 Peter Harris <git@peter.is-a-geek.org>
  */
 
-#include <windows.h>
 #include "../git-compat-util.h"
 
 /*