git-read-tree: simplify merge loops enormously

diff --git a/usage.c b/usage.c
index e774d2ef32726af0707d817cdb63fc8751ddc9d8..86211c9141b788f6dbdf7b192f0ac4f4e2527d64 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include <stdarg.h>
 #include "cache.h"
 
 static void report(const char *prefix, const char *err, va_list params)