git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Use "svn info" to fetch the version by default. Fetch the repository path as
[obnox/wireshark/wip.git]
/
mergecap.c
diff --git
a/mergecap.c
b/mergecap.c
index 89e974080442fcf654ce4f4b6bffd0fb4b6306e4..358ebe23592ef0d5bad29a94550947b5360107c7 100644
(file)
--- a/
mergecap.c
+++ b/
mergecap.c
@@
-89,7
+89,7
@@
usage(void)
fprintf(stderr, "Mergecap %s"
#ifdef SVNVERSION
- " (" SVNVERSION ")"
+ " (" SVNVERSION "
from " SVNPATH "
)"
#endif
"\n", VERSION);
fprintf(stderr, "Merge two or more capture files into one.\n");