Postavke

Osnovne postavke

Slika 3.7. Glavna stranica za postavke

Glavna stranica za postavke

Većina mogućnosti je sama po sebi razumljiva, no nekoliko njih traži pojašnjenje.

Spremanje originalne datoteke mijenja ime originalnoj datoteci u radnoj kopiji u datoteka.bak prije snimanja promjena.

Ignore line endings hides changes which are due solely to difference in line-end style.

Zanemari velika/mala slova sakriva promjene koje su nastale samo zbog razlika u velikim ili malim slovima unutar tekstač. Ovo može biti dosta korisno s aplikacijama kao što je Visual Basic, koji mijenja velika/mala slova u varijablama automatski i bez upozorenja.

Colour code in-line changes uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added).

Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes).

Ignore whitespace changes hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change.

Ignore all whitespaces hides all whitespace-only changes.

Postavke boja

Slika 3.8. Stranica za postavke boja

Stranica za postavke boja

Ovaj dijalog omogućava vam da odaberete postavke boja koje se koriste za označavanje razlčitih promjena.

Normal
Svi redci koji nisu mijenjani ili promjene zbog postavki nisu prikazane.
Dodani
Redci koji su dodani.
Uklonjeni
Redci koji su obrisani.
Modified
Lines which have relatively small changes, and are shown using inline diff. This colour is used for the unchanged portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If Colour code in-line changes is not enabled, this colour will not be used and changed lines will always be shown as replacements.
Sukobljeni
Gdje je isti redak bio mijenjan u obje datoteke.
Conflict resolved
Where the same line has been changed in both files, and you have now selected which version should be used.
Prazni
Gdje su redci dodani u suprotnom okviru, a takvi redci nisu postojali u trenutnom okviru.
Inline added text
When inline diffs are shown, added text is shown in this colour.
Inline removed text
When inline diffs are shown, deleted text is shown in this colour.
Misc whitespaces
Characters used to indicate Whitespace are shown in a different colour from normal text.