From 219c50ab10ac37e246284752a13e1248194e4aff Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 6 Jun 2009 14:17:27 +0000 Subject: Sync some rcsdiff changes to cvsdiff. As a side effect, cvs diff -t now works. There should be no functional change otherwise. OK millert --- usr.bin/cvs/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/cvs/commit.c') 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 * Copyright (c) 2006 Xavier Santolaria @@ -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); -- cgit v1.2.3-59-g8ed1b