1 new changeset in crew: http://www.bitbucket.org/tortoisehg/crew/changeset/03a57638844f/ changeset: r1946:03a57638844f user: sborho date: 2009-04-11 09:45:02 summary: thgconfig: add internal:merge as a merge option
Attempt to document it at least slightly. This is the option to chose if you like conflict markers and the ability to mark files as resolved after the fact. Fixes #159 affected #: 1 file (105 bytes) Repository URL: http://bitbucket.org/tortoisehg/crew/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. ------------------------------------------------------------------------------ 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
