diff tests/test-merge6.out @ 5299:5a4824f6665c

Test parents behaviour with files.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 11 Sep 2007 23:05:30 +0200
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff