Hello folks The use case is the following The repository has binary files and text files, on a merge the tool could solve or launch a visual merge tool for the text files but it will fail for binary files conflicts. Lets assume you use internal:dump and manually create a version of the binary with the correct changes.
How do you mark it as solved and restart the merge without opening the command line? (using tortoisehg interfaces) I think i have read somewhere the commit tool support it, but does mercurial merge everything it can or it stops at the first unsolved conflict? It might not be possible to restart the merge from the commit dialog. Regards Thanks ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
