The Merge menu offers the following commands:
switches merge function from block merge to selected line merge |
|
merges selection from first to second file |
|
merges selection from second to first file |
|
merges selection from left to right (or right to left) either above or below the differenced line without overwriting the existing text |
|
Accept All |
accepts all merge changes in specified files |
reverses the last merge action |
|
reverses all unsaved changes to compared files/folders |
|
prompts user if merge action will overwrite a file newer than the file being merged
|
|
prompts user before each merge is completed |
|
refreshes compare status after each merge is completed |