About using Diff Merge to resolve differences

When Diff Merge starts, it indicates that it has resolved all nonconflicting differences. Then, it highlights the first unresolved difference.

• To resolve merge differences