Date: Mon, 05 Apr 2010 12:47:58 +0300 From: Andriy Gapon <avg@freebsd.org> To: Garrett Cooper <yanefbsd@gmail.com> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r206176 - head/share/examples/indent Message-ID: <4BB9B1CE.2060102@freebsd.org> In-Reply-To: <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com> References: <201004050926.o359Q3Sm086401@svn.freebsd.org> <t2j7d6fde3d1004050234i291425f3h162be14ec3348786@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4BB9B1CE.2060102>