Another suggestion for treediff
It would be very useful to display the last modification date of the files in the tree and if comparing server items, display the changeset number. This would allow easier determination of which file has more recent changes.
Also, possibly allow merges to occur between two server paths.

