Examples of Diff-Merge parameter settings

The parameters defined at MDAC parameter level are used in step 3 of the Diff-Merge wizard. For example, using the parameters shown in Figure 20 for the winmerge editor (used on PC), the result during step 3 of the Diff-Merge operation would be the following (Figure 24 below).

Figure 24. Step 3 of the Diff-Merge wizard using the parameters defined in Figure 20

As you can see, the values defined at MDAC parameter level appear here. Please note that although the "Options and arguments for merge editor" parameter was defined using two $ signs (in order to ensure that Objecteering interprets them as being environment variable names), they appear here with only one $ sign.

Figures 25 and 26 show another example, this time for the filemerge editor, which is used on UNIX.

Figure 25. The "Diff-Merge" set of parameters defined for the filemerge editor

Figure 26. Step 3 of the Diff-Merge wizard using the parameters defined in Figure 25

As you can see, the values defined at MDAC parameter level appear here. Please note that although the "Options and arguments for merge editor" parameter was defined using two $ signs (in order to ensure that Objecteering interprets them as being environment variable names), they appear here with only one $ sign.