diff tests/test-pull-pull-corruption2.out @ 4999:60c54154ec4c

merge: don't forget to update the dirstate for exec bit changes
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jul 2007 11:19:53 -0500
parents 57729c56a23c
children
line wrap: on
line diff