Issue 159: Merge should actively garble all conflicted files, and allow the user to resolve later http://bitbucket.org/tortoisehg/stable/issue/159/merge-should-actively-garble-all-conflicted-files-and-allow-the-user-to-resolve
Steve Borho / sborho on Thu, 9 Apr 2009 18:39:08 +0200: Comment: Mercurial and TortoiseHg support this resolution mode, but you have to configure it properly. The settings application should provide this as an option in the merge tool drop-down list. Changes: status: new -> open component: nothing -> settings -- This is an issue notification from bitbucket.org. You are receiving this either because you are the owner of the issue, or you are following the issue. ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
