If rejects are empty after using the editor, merge with diff+patch was ok.
+ hg clone http://localhost:20059/ copyrequesting all changesabort: error: Connection refused255ls: copy: No such file or directory+ hg clone http://localhost:20059/foo copy2requesting all changesabort: HTTP Error 404: File not found255