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 Sat, 11 Apr 2009 09:51:27 +0200: Comment: this is on crew at changeset 03a57638844f internal:merge is now a drop-down option for the merge tool selection. When it is enabled, Mercurial will insert 3-way conflict markers where they occur, and it is up to the user to mark those files as resolved after those conflicts have been resolved (which is possible in the commit tool via file context menus). Any chance you can add these details to the commit tool manual on the wiki? You can use this in 0.7.x by typing in internal:merge yourself in the userconfig dialog, and it will work just fine. Changes: status: open -> resolved -- 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
