diff tests/test-merge1.out @ 1794:98b6c1cad58b

only write the dirstate when something changed
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 23 Feb 2006 02:17:08 +0100
parents db10b7114de0
children 2da2d46862fb
line wrap: on
line diff