diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2009-06-06 14:17:28 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2009-06-06 14:17:28 +0000 |
| commit | dd2613cfc1548e74a8cdb52c3fc646332ff3cf61 (patch) | |
| tree | 31979cf237d5df32b716569f454cc130c509cb35 /usr.bin/cvs/rcs.c | |
| parent | 6af36b3bddffd77e160d26d357d4566d1bd9a423 (diff) | |
Sync some rcsdiff changes to cvsdiff. As a side effect,
cvs diff -t now works. There should be no functional change
otherwise.
OK millert
Diffstat (limited to 'usr.bin/cvs/rcs.c')
| -rw-r--r-- | usr.bin/cvs/rcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index da57a21878c..00afc8215e7 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.289 2009/03/30 21:45:33 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.290 2009/06/06 14:17:27 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1361,7 +1361,7 @@ rcs_rev_remove(RCSFILE *rf, RCSNUM *rev) diff_format = D_RCSDIFF; if (cvs_diffreg(path_tmp1, path_tmp2, - fd1, fd2, newdiff) == D_ERROR) + fd1, fd2, newdiff, D_FORCEASCII) == D_ERROR) fatal("rcs_diffreg failed"); close(fd1); |