view tests/test-merge5.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 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)