The Edit menu in the Merging Window provides the following commands:
Undo | Reverses edits during a session. You have a choice of: | |
Last Resolved | Reverses the edit to the previous difference | |
Selected | Reverses the edit to the selected difference | |
All | Reverses all edits to differences, allowing you to start the Merging session again | |
Mark Selected as Resolved | Changes the mark on the selected line to show as resolved | |
Mark Remaining as Resolved | Resolves all remaining differences by accepting the lines shown in the Merged Result Pane | |
Accept Child to End of File | Resolves all remaining differences by accepting the remaining lines from the Child Pane | |
Accept Parent to End of File | Resolves all remaining differences by accepting the remaining lines from the Parent Pane |