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

[M. Warner Losh]

In message: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786 at mail.gmail.com>
            Garrett Cooper <yanefbsd at gmail.com> writes:
: 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
: >
: > Log:
: >  indent.pro example: put all options one per line
: >
: >  This should help with modification tracking.
: >
: >  Discussed with:       bde
: >  MFC after:    7 days
: >
: > Modified:
: >  head/share/examples/indent/indent.pro
: >
: > Modified: head/share/examples/indent/indent.pro
: > ==============================================================================
: > --- head/share/examples/indent/indent.pro       Mon Apr  5 09:24:24 2010        (r206175)
: > +++ head/share/examples/indent/indent.pro       Mon Apr  5 09:26:03 2010        (r206176)
: > @@ -14,5 +14,33 @@
: >  -TSTAILQ_ENTRY
: >  -TSLIST_HEAD
: >  -TSLIST_ENTRY
: > --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
: > +-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?

Actually, it will allow merging more easily.  If I wanted to add -nld
to the list and joe wanted to add -l4d, then those would be on lines
by themselves (which makes merging easier) rather than on the same
line (which makes merging impossible with today's tools).

Warner