diff mercurial/repo.py @ 4997: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 63b9d2deed48
children 65dc707606ed
line wrap: on
line diff