diff tests/test-conflict @ 5299:5a4824f6665c

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