Re: [PATCH] test: Make it easier to resolve conflicts when adding new tests

Subject: Re: [PATCH] test: Make it easier to resolve conflicts when adding new tests

Date: Wed, 26 Jan 2011 22:39:07 +1000

To: Michal Sojka, notmuch@notmuchmail.org

Cc:

From: Carl Worth


On Sun, 23 Jan 2011 12:12:24 +0100, Michal Sojka <sojkam1@fel.cvut.cz> wrote:
> 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.
> 
> This patch splits these long lists to several lines so that the
> conflicts are easier to resolve.

Thanks. That will be right handy. Committed.

-Carl

-- 
carl.d.worth@intel.com
part-000.sig (application/pgp-signature)

Thread: