TortoiseMerge has several different uses:
Pregled razlika između dvije datoteke i spajanje izmjena u jednu od njih, ili odstranjivanje neželjenih izmjena.
Obrada konflikata između lokalnih izmjena i izmjena u Subversion repozitoriju nakon ažuriranja.
Primjena zakrpe. Ovo je razlog zašto je TortoiseMerge stvoren :)
In this mode you are comparing two files. The file in the left pane is considered to be the original file (sometimes referred to as Theirs, and the file in the right pane is the modified file (sometimes referred to as Mine.
You can make simple line-based changes to the file in the right pane which include:
Reverting changed lines back to the text shown in the left pane.
Using a combination of both blocks, either Theirs before Mine or Mine before Theirs.
You can also edit the file in the right pane just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files.