Merge branch 'bw/push-options-recursively-to-submodules' into next

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index e4b395963b9457a680a369c3e1997c799f8793ab..1846685a21a44decfe5790f0020dcf933c8d6583 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -47,7 +47,7 @@ static struct {
 
 static struct {
        uint32_t revision;
-       unsigned long timestamp;
+       timestamp_t timestamp;
        struct strbuf log, author, note;
 } rev_ctx;