diff tests/test-conflict.out @ 9413:a5adf55ee533

manifest.add(): simplify with iterators and generator expressions
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 02 Sep 2009 20:18:35 +0200
parents 9fe7e6acf525
children b2310903c462
line wrap: on
line diff