Hi, I merged using the plugin (ver 1.2.954, Hg version 1.1) and at first everything looked fine. Only later I noticed that there was a conflict, in my version I had modified two files when in the remote (to-be-merged) version those files were removed. The mercurialeclipse merge silently took my version.
It should have asked me whether I wanted to keep my version or delete the file, this is how hg command line and TortoiseHg handle it. -- Regards, Georg. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "MercurialEclipse" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/mercurialeclipse?hl=en -~----------~----~----~----~------~----~------~--~---
