From owner-svn-src-all@FreeBSD.ORG  Fri Mar 14 03:09:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BDF06533;
 Fri, 14 Mar 2014 03:09:29 +0000 (UTC)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D03AB287;
 Fri, 14 Mar 2014 03:09:28 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.8/8.14.8) with ESMTP id s2E39PIx046589
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Fri, 14 Mar 2014 07:09:25 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.8/8.14.8/Submit) id s2E39PTI046588;
 Fri, 14 Mar 2014 07:09:25 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Fri, 14 Mar 2014 07:09:25 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Eitan Adler <eadler@FreeBSD.org>
Subject: Re: svn commit: r263142 - in head: lib/libpam/modules/pam_radius
 lib/libpam/modules/pam_tacplus sbin/mdconfig secure/usr.bin/bdes
 share/doc/papers/beyond4.3 share/doc/papers/diskperf share/doc/papers/f...
Message-ID: <20140314030925.GG40073@FreeBSD.org>
References: <201403140307.s2E37q5R039829@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201403140307.s2E37q5R039829@svn.freebsd.org>
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Mar 2014 03:09:29 -0000

On Fri, Mar 14, 2014 at 03:07:52AM +0000, Eitan Adler wrote:
E> Author: eadler
E> Date: Fri Mar 14 03:07:51 2014
E> New Revision: 263142
E> URL: http://svnweb.freebsd.org/changeset/base/263142
E> 
E> Log:
E>   multiple: Remove 3rd clause from BSD license where approved by the
E>   regents and renumber.
E>   
E>   This patch skips files in contrib/ and crypto/
E>   
E>   Acked by:	imp
E>   Discussed with:	emaste
E> 
E> Added:
E>   head/usr.sbin/IPXrouted/
E>      - copied from r262539, head/usr.sbin/IPXrouted/

Seems like you blindly did "mine full", when subversion reported
you a merge conflict.

-- 
Totus tuus, Glebius.