Diff

Figure Figure 3.2, “submerge Diff” shows a typical diff in submerge. The lines in the left and the right file that differ are drawn with a red background. In the middle between the left and the right file you see the Difference Marker. Each difference between the two files is counted starting with 1. The difference number is the number between the lines of the Difference Marker. Those two lines mark the lines from the left and the right file that represent that difference.

Figure 3.2. submerge Diff

submerge Diff

You can jump with the Next/Previous Difference buttons in the tool bar between the differences of the two files. The Current Difference is highlighted in black. You can also use the wheel of your mouse to jump to the next or previous difference.

In the status bar you can see the Difference Count. That is the number of differences of the two input files.

The Merge button is used to merge the two input file. Merging is explained in the next section.