Pavel Sanda wrote:
For example, like in the attachment.i would advise to put it into trunk before some merge conflict happens. usuall procedure is to highlight new text by change tracking and let Uwe do the postprocessing.
yes, I had change-tracking enabled in the file I had attached.
T.