The checkboxes on the file difference window should show you the file's read/write state on disk. If you are positive that you have made the file writable, try doing the diff again but make sure the "Source diff" option is turned off. I think the source diff option prevents merging changes.
Hope this helps,
Marty