[TSVN] Manual update - merging

Hi folks,

I have updated the section on branching/tagging/merging so that needs
translating to German. I have split up dug_branchtag.xml and created a
new dug_merge.xml.

There are relatively minor changes to branching & tagging, but the
indentation has changed so you will need to diff without leading white
space to see what has really changed.

The new merge file is loosely based on the old section, but it is
heavily modified, so it is essentially a new translation. This version
assumes no changes to the merge dialog.

The update is only on trunk at present, not the 1.1.3 branch.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org