Typically, Diff Merge begins a session by resolving
all nonconflicting (also called automatic) differences and then presents to
you the differences that remain. (A nonconflicting difference is a difference
that is displayed in only one contributor.)
Procedure
To see nonconflicting differences before they are resolved, use
one of the following commands to resolve them:
Click Tools > Accept All
Automatic Diffs to resolve all nonconflicting differences.
Click one of the following commands to resolve all nonconflicting
differences in the to-version contributor:
On Linux and the UNIX system, Tools > Accept only "To-version" Automatic Diffs
On Windows systems, Tools > Accept
"To-version" Automatic Diffs
Results
In either case, you must then resolve the remaining differences manually.