:mime-type Value Example: 1234 [...] the value. Add Opens a [...] with its value Remove Deletes

) have changed from the base [...] all colliding changes [...] . All changes with a conflict

or variables in a variable [...] constants or variables [...] over multiple global variable

value in the SVN [...] value is displayed [...] by changes

) have changed from the base [...] when they are changed locally Marker [...] or variables for the project