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, 14 May 2009 18:48:10 +0200: Comment: This is what mercurial does if you specify an editor as the merge tool. These files are created for the merge and removed after. If you want this behavior you have to configure it. IE: see the configuration of gvimdiff in [merge-tools]. TortoiseHg does not ship an editor, so we can't provide this as a default option. -- 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. ------------------------------------------------------------------------------ The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
