Kada pokrenete TortoiseMerge bez argumenata, trebat ćete otvoriti datoteke ručno koristeći→ .
The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patch file. Depending on what you choose, the corresponding edit boxes and browse buttons are activated.
If you want to compare / merge files you have to set at least two of the three possible paths for
Theirs. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view.
If you want to merge three files, TortoiseMerge will show you the differences in a three pane view. This view is generally used if you need to resolve conflicted files. The output file is not named in this case and you will have to use the→ . to save the results.
If you want to apply a patch file you have to set both the path to the patch file itself and the path to the folder where the patch file should be applied.
Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!