summaryrefslogtreecommitdiff
path: root/regress/usr.bin/rcs/rcsmerge.out
diff options
context:
space:
mode:
Diffstat (limited to 'regress/usr.bin/rcs/rcsmerge.out')
-rw-r--r--regress/usr.bin/rcs/rcsmerge.out2
1 files changed, 0 insertions, 2 deletions
diff --git a/regress/usr.bin/rcs/rcsmerge.out b/regress/usr.bin/rcs/rcsmerge.out
index ca484deddc2..e29d3eb526b 100644
--- a/regress/usr.bin/rcs/rcsmerge.out
+++ b/regress/usr.bin/rcs/rcsmerge.out
@@ -1,5 +1,4 @@
<<<<<<< blah.c
-/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -15,7 +14,6 @@ main(int argc, char **argv)
return (0);
}
=======
-/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>