bug report - optimization suggestion for 1.10's new conflict resolver.

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 ne

possible client bug with 1.10 automatic conflict resolver

I'm seeing different behavior with automatic conflict resolver when operating against a 1.10.0-alpha3 compared to a 1.7.10 server. I'm using a 1.10.0-alpha3 client. Test case * Create branch B from branch A. * Checkout branch B. * Modify file contents in branch B + commit. * Mo