Files skipped during merge?

[mr.matth...@gmail.com]

Hello,

I upgraded to 1.10 this morning and went to merge in some changes from the branch to the trunk. About 5 files were skipped (red text) with no apparent reason. The files were copied down into the folder though so when we went to do this manually we ended up just doing an Add.

Is this new behavior expected?

We played around with every option we could (ignoring ancestry etc) to see if we could get it work but were unsuccessful.

Thank you