Remember to use this option after resolving a 'conflict' state (see the section called “Diff-3 (conflict)”).