If you click Resolve and Advance Mode in the navigation toolbar or click the corresponding command on the Navigate menu, you can move to the next unresolved difference after you resolve a particular difference. (A difference is unresolved if the merge point corresponding to that difference contains the text merge needed.)