diff hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff