From 72d09e4a9fed783ef22e3a2fada0bf0ec55d212c Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 20 Apr 2011 18:33:13 +0000 Subject: Use -u when diff context is 3, from Michael W Bombardieri, tweaked by millert. --- usr.bin/cvs/diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/cvs/diff.c') diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 11762ba4d69..8f71ba52ce6 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.159 2010/07/30 21:47:18 ray Exp $ */ +/* $OpenBSD: diff.c,v 1.160 2011/04/20 18:33:13 nicm Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann * Copyright (c) 2006 Joris Vink @@ -239,7 +239,7 @@ cvs_diff(int argc, char **argv) cvs_client_send_request("Argument -n"); break; case D_UNIFIED: - if (cvs_cmdop == CVS_OP_RDIFF) + if (cvs_cmdop == CVS_OP_RDIFF || diff_context == 3) cvs_client_send_request("Argument -u"); else { cvs_client_send_request("Argument -U %d", -- cgit v1.2.3-59-g8ed1b