diff tests/test-merge6.out @ 4656:4eeb91870d3b

dirstate: fix typo
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 21 Jun 2007 00:34:14 -0300
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff