65130ea3bf
Fixes issue where the wrong parent is selected for a merge if the correct parent consists entirely of files that were modified in earlier changesets in the merge (it was selecting the highest "version FROM" instead of "version TO").