If you are using a version control system and want to merge a different version of a file from disk, enter the filename in the Filename field and the version of that file to be merged in the adjacent Version field.
Enter the name of the first file you want to merge.
Enter the name of the second file you want to merge. If you specify the same file as you specified in the File1 field, then File1 file refers to the copy currently open in the Editor, while File2 file refers to the file on disk. This is useful if someone else has edited the file at the same time you were working on it.
Enter the name the file from which the other two files, File1 and File2, are derived. If you are merging two files, then leave this field blank
Select if you want the Editor to try to resolve merges without prompting you. Deselect if you want to manually review every proposed merge. This field has no meaning when merging two files.