diff options
| author | peter <peter@FreeBSD.org> | 2001-08-10 09:53:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-08-10 09:53:06 +0000 |
| commit | 75f7ac20d05fc07bd23bbbaa37a5066b87ca87bb (patch) | |
| tree | 9d465dbd69e6033ab4d69e284056926039b7890c /contrib/cvs/src/rcscmds.c | |
| parent | c132709d1892a50d7915da8685face38ada32e4f (diff) | |
| download | FreeBSD-src-75f7ac20d05fc07bd23bbbaa37a5066b87ca87bb.zip FreeBSD-src-75f7ac20d05fc07bd23bbbaa37a5066b87ca87bb.tar.gz | |
Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is
still some suspicious and/or broken stuff to fix yet.
Diffstat (limited to 'contrib/cvs/src/rcscmds.c')
| -rw-r--r-- | contrib/cvs/src/rcscmds.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/cvs/src/rcscmds.c b/contrib/cvs/src/rcscmds.c index bcdffd5..b233b76 100644 --- a/contrib/cvs/src/rcscmds.c +++ b/contrib/cvs/src/rcscmds.c @@ -532,9 +532,11 @@ RCS file: ", 0); message on stderr. */ int -diff_exec (file1, file2, options, out) +diff_exec (file1, file2, label1, label2, options, out) char *file1; char *file2; + char *label1; + char *label2; char *options; char *out; { @@ -577,6 +579,10 @@ diff_exec (file1, file2, options, out) /* The first word in this string is used only for error reporting. */ sprintf (args, "diff %s", options); call_diff_setup (args); + if (label1) + call_diff_arg (label1); + if (label2) + call_diff_arg (label2); call_diff_arg (file1); call_diff_arg (file2); free (args); |
