diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 1997-02-05 04:29:56 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 1997-02-05 04:29:56 +0000 |
| commit | 860c2cf2bc6592828a3468ab8ee661042b059ae8 (patch) | |
| tree | fde30676422ab07fdec2d11fde3fc5693fdbb8cf /gnu/usr.bin/rcs/merge | |
| parent | b61013aa0c73c687493c80193bc040d29b351fb8 (diff) | |
Diffstat (limited to 'gnu/usr.bin/rcs/merge')
| -rw-r--r-- | gnu/usr.bin/rcs/merge/merge.1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/merge/merge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1 index 11440263a7fd..f39cb6699d7c 100644 --- a/gnu/usr.bin/rcs/merge/merge.1 +++ b/gnu/usr.bin/rcs/merge/merge.1 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: merge.1,v 1.1.1.1 1993/06/18 04:22:14 jkh Exp $ +.Id $Id: merge.1,v 1.1.1.1.8.1 1996/02/23 09:31:53 peter Exp $ .TH MERGE 1 \*(Dt GNU .SH NAME merge \- three-way file merge diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c index b33d1cba3792..9e8ebb017724 100644 --- a/gnu/usr.bin/rcs/merge/merge.c +++ b/gnu/usr.bin/rcs/merge/merge.c @@ -41,7 +41,7 @@ badoption(a) } -mainProg(mergeId, "merge", "$Id: merge.c,v 1.1.1.1 1993/06/18 04:22:14 jkh Exp $") +mainProg(mergeId, "merge", "$Id: merge.c,v 1.1.1.1.8.1 1996/02/23 09:31:54 peter Exp $") { register char const *a; char const *arg[3], *label[3], *edarg = 0; |