merge: don't forget to update the dirstate for exec bit changes
adding helloabort: '\n' and '\r' disallowed in filenamesadding helloabort: '\n' and '\r' disallowed in filenamesadding helloabort: '\n' and '\r' disallowed in filenamesadding helloabort: '\n' and '\r' disallowed in filenamesf hello hellof hello hello