diff tests/test-merge2.out @ 4833:fc8b3e7cbf6b

improve warning for hg add foo; hg mv foo bar
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 11 Jul 2007 19:56:16 -0300
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line diff