svn commit: r206176 - head/share/examples/indent

[Andriy Gapon]

on 05/04/2010 12:34 Garrett Cooper said the following:
> On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon <avg at 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