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
Anonymous on Thu, 2 Jul 2009 14:04:08 +0200: Comment: Gee, thanks! This is what we needed, we can work with that. Of course it would have been better if the conflicts were marked inside the file with <<<< like with internal:merge, maybe you can unify the options sometime. Obs: Beside the original conflicted file, 4 files are created: file.base, file.other, file.local and file.orig. I think that .local and .orig are duplicated. Having both is confusing, can you remove .orig? -- 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. ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
