Allow the user to control the verbosity of merge-recursive.

diff --git a/convert-objects.c b/convert-objects.c
index 631678b08a7cb83b0349f1a683d3cd7fb797fb7a..a63013298566fd3dc21275a90ca976227de8c7f0 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -1,7 +1,3 @@
-#define _XOPEN_SOURCE 500 /* glibc2 and AIX 5.3L need this */
-#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
-#define _GNU_SOURCE
-#include <time.h>
 #include "cache.h"
 #include "blob.h"
 #include "commit.h"