1.6 change: New conflict summary after 'svn update' and 'svn merge'

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

#126 1.6 change: New conflict summary after 'svn update' and 'svn merge'

Milestone: en-1.6

Status: Fixed

Owner: nobody

Labels: None

Priority: Medium

Type: Defect

Updated: 2011-08-16

Created: 2011-06-30

Creator: Anonymous

Private: No

Originally created by: cmpilato
Originally owned by: cmpilato

http://subversion.apache.org/docs/release-notes/1.6.html#conflict-summary

Discussion

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2011-08-16

Originally posted by: cmpilato

Finished this in [r3972] (but did the work over the course of a few revisions).

Status: Fixed

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) Finished this in [r3972] \(but did the work over the course of a few revisions\). **Status:** Fixed

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.