To accept difference resolutions automatically

About this task

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:

Results

In either case, you must then resolve the remaining differences manually.

Feedback