.\" $FreeBSD$ .\" .\" Written by Raymond Lai . .\" Public domain. .\" .\" Copyright (c) 2012 Jesse Hagewood .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .Dd $Mdocdate: Aug 16 2012 $ .Dt ZSDIFF 1 .Os .Sh NAME .Nm zsdiff .Nd side-by-side diff of compressed files. .Sh SYNOPSIS .Nm .Op Fl abdilstW .Op Fl I Ar regexp .Op Fl o Ar outfile .Op Fl w Ar width .Ar file1 .Ar file2 .Sh DESCRIPTION .Nm displays two files side by side, with any differences between the two highlighted as follows: new lines are marked with .Sq \*(Gt ; deleted lines are marked with .Sq \*(Lt ; and changed lines are marked with .Sq \*(Ba . .Pp .Nm can also be used to interactively merge two files, prompting at each set of differences. .Pp See sdiff(1) for options. .Pp .Sh ENVIRONMENT .Bl -tag -width Ds .It Ev EDITOR , VISUAL Specifies an editor to use with the .Fl o option. If both .Ev EDITOR and .Ev VISUAL are set, .Ev VISUAL takes precedence. If neither .Ev EDITOR nor .Ev VISUAL are set, the default is .Xr vi 1 . .It Ev TMPDIR Specifies a directory for temporary files to be created. The default is .Pa /tmp . .El .Sh SEE ALSO .Xr cmp 1 , .Xr diff 1 , .Xr zdiff 1 , .Xr diff3 1 , .Xr vi 1 , .Xr re_format 7