diff tests/test-bad-pull @ 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 66249be9aa23
children e3a0c092b4e2
line wrap: on
line diff