diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2006-03-15 02:36:47 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2006-03-15 02:36:47 +0000 |
| commit | 05d04d8298362f665859c70fa3dbe2cc7f2a8b06 (patch) | |
| tree | c67e893538aada380b7654430556b6ad9e711b64 /regress/usr.bin/rcs/rcsmerge.out | |
| parent | 5de41dd1a3b917751ca04c2d27ebc51c331539b7 (diff) | |
Fix and enable rcsmerge test.
rcsmerge stuff ok niallo
Diffstat (limited to 'regress/usr.bin/rcs/rcsmerge.out')
| -rw-r--r-- | regress/usr.bin/rcs/rcsmerge.out | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/regress/usr.bin/rcs/rcsmerge.out b/regress/usr.bin/rcs/rcsmerge.out index e29d3eb526b..71ace5fc458 100644 --- a/regress/usr.bin/rcs/rcsmerge.out +++ b/regress/usr.bin/rcs/rcsmerge.out @@ -1,4 +1,3 @@ -<<<<<<< blah.c #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -13,19 +12,3 @@ main(int argc, char **argv) return (0); } -======= -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* a comment */ - -/* main function */ -int -main(int argc, char **argv) -{ - printf("foo bar\n"); - - return (0); -} ->>>>>>> 1.3 |