Merge branch 'ah/log-decorate-default-to-auto'

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 7d93627e454ed09ed2a61dff62271dc1949bb7f9..75fe883aac1ee17b9dda40dd88b7a4a4fd328318 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -5,7 +5,7 @@
 static int boolean = 0;
 static int integer = 0;
 static unsigned long magnitude = 0;
-static unsigned long timestamp;
+static timestamp_t timestamp;
 static int abbrev = 7;
 static int verbose = -1; /* unspecified */
 static int dry_run = 0, quiet = 0;