I'm a big fan of the auto tree conflict resolution feature. One optimization I'd like to suggest is after a tree conflict is found, and if the two branches share ancestry then branch move history search should be constrained to the start revision of when the branch was made.
When testing the new conflict resolver, I noticed the file / directory move search taking upwards of 10-15 seconds while it was reporting searching tens of thousands of revisions (even though the merge branch was created off the current working branch 4 or 5 revisions prior.)
