aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c
index 578ab5e3d4..afc3bad29a 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -52,7 +52,7 @@
#include <wiretap/merge.h>
-#include "svnversion.h"
+#include "version.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
@@ -117,8 +117,8 @@ usage(gboolean is_error)
}
fprintf(output, "Mergecap %s"
-#ifdef SVNVERSION
- " (" SVNVERSION " from " SVNPATH ")"
+#ifdef GITVERSION
+ " (" GITVERSION " from " GITBRANCH ")"
#endif
"\n", VERSION);
fprintf(output, "Merge two or more capture files into one.\n");