From: Carl Worth <cworth@cworth.org>
To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org
Subject: Re: [PATCH] test: Make it easier to resolve conflicts when adding new
	tests
In-Reply-To: <1295781144-20308-1-git-send-email-sojkam1@fel.cvut.cz>
References: <1295781144-20308-1-git-send-email-sojkam1@fel.cvut.cz>
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1
	(i486-pc-linux-gnu)
Date: Wed, 26 Jan 2011 22:39:07 +1000
Message-ID: <87bp33261g.fsf@yoom.home.cworth.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Transfer-Encoding: quoted-printable

On Sun, 23 Jan 2011 12:12:24 +0100, Michal Sojka <sojkam1@fel.cvut.cz> wrot=
e:
> Currently, there are two places in the test framework that contain very
> long list on a single line. Whenever a test is added (or changed) in
> several branches and these branches are merged, it results in conflict
> which is hard to resolve because one has to go through the whole long
> line to find where the conflict is.
>=20
> This patch splits these long lists to several lines so that the
> conflicts are easier to resolve.

Thanks. That will be right handy. Committed.

=2DCarl

=2D-=20
carl.d.worth@intel.com

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQFNQBXr6JDdNq8qSWgRAo3VAKCS2Q8ykDl6T86hQDRXK5Hc4px2bgCeKWjF
6AkI9+loDN/eGk0DTQlZnKY=
=y65/
-----END PGP SIGNATURE-----
--=-=-=--