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

Carl Worth cworth at cworth.org
Wed Jan 26 04:39:07 PST 2011


On Sun, 23 Jan 2011 12:12:24 +0100, Michal Sojka <sojkam1 at 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 at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20110126/dd878426/attachment-0001.pgp>


More information about the notmuch mailing list