SVN 1.5 - Resolve Conflicts (Merging Others' Changes)

Karl Heinz Marbaise khmarbaise at gmx.de
Thu Mar 20 18:03:57 CDT 2008


Hi,

sorry i have missed the patch for the bug i reported...patch attachted...

My Log-Message entry for this patch:

* src/en/book/ch02-basic-usage.xml
  - updated output of interactive conflict resolution.


Kind regards
Karl Heinz Marbaise
-- 
SoftwareEntwicklung Beratung Schulung    Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise        ICQ#: 135949029
Hauptstrasse 177                         USt.IdNr: DE191347579
52146 W├╝rselen                           http://www.soebes.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict.patch
Type: text/x-patch
Size: 2106 bytes
Desc: not available
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20080321/d76f3325/attachment-0001.bin>


More information about the svnbook-dev mailing list