diff options
| author |   nicm <nicm@openbsd.org> | 2011-04-20 18:33:13 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2011-04-20 18:33:13 +0000 |
| commit | 72d09e4a9fed783ef22e3a2fada0bf0ec55d212c (patch) | |
| tree | 62d901a994af075c48fa7c087e6de7d07a87c5dd /usr.bin/cvs/diff.c | |
| parent | Back out r1.10 of mutex.c as this breaks serial on hppa (at least for MP). (diff) | |
| download | wireguard-openbsd-72d09e4a9fed783ef22e3a2fada0bf0ec55d212c.tar.xz wireguard-openbsd-72d09e4a9fed783ef22e3a2fada0bf0ec55d212c.zip | |
Use -u when diff context is 3, from Michael W Bombardieri, tweaked by
millert.
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -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", |