comparison tests/test-up-local-change.out @ 3920:f2c4a2ee59ed

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 16 Dec 2006 14:51:22 -0600
parents fffc8a733bf9
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
3909:dd86f99e3c02 3920:f2c4a2ee59ed