From owner-svn-src-all@freebsd.org  Sun Aug 14 06:06:11 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3781FBB9AC4;
 Sun, 14 Aug 2016 06:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00A331FAB;
 Sun, 14 Aug 2016 06:06:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7E66AlE055955;
 Sun, 14 Aug 2016 06:06:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7E66Ah5055954;
 Sun, 14 Aug 2016 06:06:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201608140606.u7E66Ah5055954@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 14 Aug 2016 06:06:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-svnadmin@freebsd.org
Subject: svn commit: r304073 - svnadmin/conf
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Aug 2016 06:06:11 -0000

Author: gjb
Date: Sun Aug 14 06:06:09 2016
New Revision: 304073
URL: https://svnweb.freebsd.org/changeset/base/304073

Log:
  Revert r304070.
  
  I have more important things to deal with than bikesheds.
  
  With hat:	svnadm

Modified:
  svnadmin/conf/mailer.conf

Modified: svnadmin/conf/mailer.conf
==============================================================================
--- svnadmin/conf/mailer.conf	Sun Aug 14 05:18:38 2016	(r304072)
+++ svnadmin/conf/mailer.conf	Sun Aug 14 06:06:09 2016	(r304073)
@@ -143,7 +143,7 @@ mail_command = /usr/sbin/sendmail
 # This is not passed to the shell, so do not use shell metacharacters.
 # The command is split around whitespace, so if you want to include
 # whitespace in the command, then ### something ###.
-diff = /usr/bin/diff -u -L %(label_from)s -L %(label_to)s %(from)s %(to)s
+diff = /usr/bin/diff -up -L %(label_from)s -L %(label_to)s %(from)s %(to)s
 
 # The default prefix for the Subject: header for commits.
 commit_subject_prefix = svn commit: