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/commit.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/commit.c')
| -rw-r--r-- | usr.bin/cvs/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 6accad5063a..36f2b606c56 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.147 2009/03/26 22:54:37 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.148 2009/06/06 14:17:27 ray Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -760,7 +760,7 @@ commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse) fd2 = f; } - if (cvs_diffreg(p1, p2, fd1, fd2, b) == D_ERROR) + if (cvs_diffreg(p1, p2, fd1, fd2, b, D_FORCEASCII) == D_ERROR) fatal("commit_diff: failed to get RCS patch"); close(fd1); |