Issue 158: Clicking on a file in ChangeLog should *always* open Diff tool http://bitbucket.org/tortoisehg/stable/issue/158/clicking-on-a-file-in-changelog-should-always-open-diff
kiilerix on Mon, 13 Apr 2009 13:26:09 +0200: Comment: FWIW I partly agree. The goal is that when a diff of a merge is shown in a (multi-pane) diff/merge tool then it should show how it looked when the merge had been completed and the tool was closed. 4 variables are used for merge tool configuration: $local $base $other $output. When all 4 are specified then it can be used for diff tools too. "output" is the child, and "local" and "other" are the parents. "base" is probably not relevant but doesn't hurt. But often only 3 of them are specified; "output" is left out, and then "local" will be used for the first parent initially and ends up being used as the child. That can't be used directly for our purpose. Instead we could put the parents in "local" and "other" and the _child_ in "base". Yes, that is almost the reverse, and the labels might be wrong, but it will work. Methinks. -- 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
