From owner-svn-soc-all@FreeBSD.ORG  Fri Aug 17 17:02:43 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id CC129106568E
	for <svn-soc-all@FreeBSD.org>; Fri, 17 Aug 2012 17:02:41 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 17 Aug 2012 17:02:41 +0000
Date: Fri, 17 Aug 2012 17:02:41 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120817170241.CC129106568E@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240477 - soc2012/jhagewood/sdiff
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Aug 2012 17:02:44 -0000

Author: jhagewood
Date: Fri Aug 17 17:02:41 2012
New Revision: 240477
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240477

Log:
  compiled zdiff man file

Added:
  soc2012/jhagewood/sdiff/zsdiff-man.txt

Added: soc2012/jhagewood/sdiff/zsdiff-man.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2012/jhagewood/sdiff/zsdiff-man.txt	Fri Aug 17 17:02:41 2012	(r240477)
@@ -0,0 +1,32 @@
+ZSDIFF(1)               FreeBSD General Commands Manual              ZSDIFF(1)
+
+NAME
+     zsdiff -- side-by-side diff of compressed files.
+
+SYNOPSIS
+     zsdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2
+
+DESCRIPTION
+     zsdiff displays two files side by side, with any differences between the
+     two highlighted as follows: new lines are marked with `>'; deleted lines
+     are marked with `<'; and changed lines are marked with `|'.
+
+     zsdiff can also be used to interactively merge two files, prompting at
+     each set of differences.
+
+     See sdiff(1) for options.
+
+ENVIRONMENT
+     EDITOR, VISUAL
+             Specifies an editor to use with the -o option.  If both EDITOR
+             and VISUAL are set, VISUAL takes precedence.  If neither EDITOR
+             nor VISUAL are set, the default is vi(1).
+
+     TMPDIR  Specifies a directory for temporary files to be created.  The
+             default is /tmp.
+
+SEE ALSO
+     cmp(1), diff(1), zdiff(1), diff3(1), vi(1), re_format(7)
+
+
+FreeBSD 9.0                     August 16, 2012                    FreeBSD 9.0