From owner-svn-src-head@FreeBSD.ORG Mon Apr 5 09:34:57 2010 Return-Path: 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 E0F9C1065672; Mon, 5 Apr 2010 09:34:57 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-qy0-f181.google.com (mail-qy0-f181.google.com [209.85.221.181]) by mx1.freebsd.org (Postfix) with ESMTP id 22F128FC13; Mon, 5 Apr 2010 09:34:56 +0000 (UTC) Received: by qyk11 with SMTP id 11so3793308qyk.13 for ; Mon, 05 Apr 2010 02:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:received:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=O0DziPVMemi2w5DIABFriNYrZ1BkZBLRT5sDGG7/eOw=; b=hIdIjYQMrbV7ImoHNj1tuxEhon4+6JXf9wbmVhYw218qID+wSn8IUL43i+K7A/gNKG XLXVv3bWMhStOCkW1tL2UcOK3tGRUvWEnxGtkSYI6ltDuL7U+jfzwtAWJ15Pa5u7IXyV 5aDuJlh3z9aelMjPQ8Exl5RjjAmgbJ8aBvKI4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Gsozgm4nOgAKirrHW0O7qwhC2K/f1eUVnTiaR/xq4JfjPPS4lmca1Ja45mtpjF0Onl UMaMxRbEwOaJ5Lzwi9DegxuXdlYhCy/Igb88x7+zvV5Rlqqg2h+iyR/ONMLLmyUfYRT0 H1z1Qiq/gNb6enUhDhY7E2enAegs+YqM7oNIA= MIME-Version: 1.0 Received: by 10.229.33.72 with HTTP; Mon, 5 Apr 2010 02:34:56 -0700 (PDT) In-Reply-To: <201004050926.o359Q3Sm086401@svn.freebsd.org> References: <201004050926.o359Q3Sm086401@svn.freebsd.org> Date: Mon, 5 Apr 2010 02:34:56 -0700 Received: by 10.229.221.78 with SMTP id ib14mr8946576qcb.28.1270460096364; Mon, 05 Apr 2010 02:34:56 -0700 (PDT) Message-ID: From: Garrett Cooper To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2010 09:34:58 -0000 On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon wrote: > Author: avg > Date: Mon Apr =A05 09:26:03 2010 > New Revision: 206176 > URL: http://svn.freebsd.org/changeset/base/206176 > > Log: > =A0indent.pro example: put all options one per line > > =A0This should help with modification tracking. > > =A0Discussed with: =A0 =A0 =A0 bde > =A0MFC after: =A0 =A07 days > > Modified: > =A0head/share/examples/indent/indent.pro > > Modified: head/share/examples/indent/indent.pro > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/examples/indent/indent.pro =A0 =A0 =A0 Mon Apr =A05 09:24:= 24 2010 =A0 =A0 =A0 =A0(r206175) > +++ head/share/examples/indent/indent.pro =A0 =A0 =A0 Mon Apr =A05 09:26:= 03 2010 =A0 =A0 =A0 =A0(r206176) > @@ -14,5 +14,33 @@ > =A0-TSTAILQ_ENTRY > =A0-TSLIST_HEAD > =A0-TSLIST_ENTRY > --bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -n= dj > --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta = -nv > +-bad > +-bap > +-nbbb > +-nbc > +-br > +-nbs > +-c41 > +-cd41 > +-cdb > +-ce > +-ci4 > +-cli0 > +-d0 > +-di8 > +-ndj > +-ei > +-nfc1 > +-nfcb > +-i8 > +-ip8 > +-l79 > +-lc77 > +-ldi0 > +-nlp > +-npcs > +-psl > +-sc > +-nsob > +-ta > +-nv Isn't doing something like this going to make merge collisions more prevalent? Thanks, -Garrett