diff tests/test-rename-dir-merge.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 bb1800a7d7e1
children dee573ba79f1
line wrap: on
line diff