[PATCH] 'svn merge' tree conflict use cases

Hi folks,

As a follow-up to the existing 'svn update' use cases for the tree
conflicts problem, here's a patch for the notes directory describing
the corresponding 'svn merge' use cases.

Regards,
Steve

[[[

Describe simple 'svn merge' use cases for tree conflict handling. See
issue #2282 for background.

* notes/tree-conflicts/use-cases.txt
   (): Minor tweak to use case 2. Added use cases 4-6.

]]]

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org