From owner-svn-src-head@FreeBSD.ORG  Mon Apr  5 09:48:03 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8644106564A;
	Mon,  5 Apr 2010 09:48:03 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D0618FC12;
	Mon,  5 Apr 2010 09:48:01 +0000 (UTC)
Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id MAA05462;
	Mon, 05 Apr 2010 12:47:59 +0300 (EEST)
	(envelope-from avg@freebsd.org)
Received: from localhost.topspin.kiev.ua ([127.0.0.1])
	by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1NyiuV-000FIy-4t; Mon, 05 Apr 2010 12:47:59 +0300
Message-ID: <4BB9B1CE.2060102@freebsd.org>
Date: Mon, 05 Apr 2010 12:47:58 +0300
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Thunderbird 2.0.0.24 (X11/20100321)
MIME-Version: 1.0
To: Garrett Cooper <yanefbsd@gmail.com>
References: <201004050926.o359Q3Sm086401@svn.freebsd.org>
	<t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
In-Reply-To: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
X-Enigmail-Version: 0.96.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r206176 - head/share/examples/indent
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Apr 2010 09:48:03 -0000

on 05/04/2010 12:34 Garrett Cooper said the following:
> On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon <avg@freebsd.org> wrote:
>> Author: avg
>> Date: Mon Apr  5 09:26:03 2010
>> New Revision: 206176
>> URL: http://svn.freebsd.org/changeset/base/206176
[snip]
>> +-sc
>> +-nsob
>> +-ta
>> +-nv
> 
>     Isn't doing something like this going to make merge collisions
> more prevalent?

Not sure if I am following you.
Do you suggest that it's easier to merge multiple changes to the same line than
multiple changes on the separate lines?

-- 
Andriy Gapon