Issue 41: on merge commits, you only see file list from one parent http://bitbucket.org/tortoisehg/stable/issue/41/on-merge-commits-you-only-see-file-list-from-one
Steve Borho / sborho on Fri, 17 Apr 2009 06:42:23 +0200: Comment: After revisiting this and analyzing the issue, I think the current behavior is acceptable for the commit tool. It will list all "interesting" files that required user interaction and it will list all files that the 'other' branch touched. This is what the user wants to see 99% of the time. The rest would just be noise. That said, I plan to add 3-way diffs to the visual diff dialog before 0.8. So the user will be able to see the diffs to the other parent should they choose. See issue #158 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. ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
