Default value: see the following table:
Setting | Object type | Client | Default |
---|---|---|---|
ccm.cli.tools.merge.dir.unix | directory | UNIX | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
ccm.cli.tools.merge.dir.windows | directory | Windows | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
ccm.cli.tools.merge.ascii.unix | ascii | UNIX | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
ccm.cli.tools.merge.ascii.windows | ascii | Windows | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
ccm.cli.tools.merge.project.unix | project | UNIX | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %project1 %ancestor %project2 |
ccm.cli.tools.merge.project.windows | project | Windows | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %project1 %ancestor %project2 |
ccm.cli.tools.merge.symlink.unix | symlinks | UNIX | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
ccm.cli.tools.merge.symlink.windows | symlink | Windows | %ccm_home/bin/util/cc_merge %ccm_home %{encoding[null='CP1252']} %outfile %file1 %ancestor %file2 |
The preference value supports the following keywords:
Keyword | Expands to |
---|---|
%ccm_home | The Rational Synergy client installation path. |
%database | The Rational Synergy database path on the server. |
%user | The name of the current Rational Synergy user. |
%file1 | The full path of the first object being merged. |
%file2 | The full path of the second object being merged. |
%ancestor | The full path of the closest common ancestor of the first and second objects being merged. |
%outfile | The full path of the temporary output file into which the merge tool writes the results of the merge. |