comparison tests/test-merge-default.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 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
4966:8d982aef0be1 4999:60c54154ec4c