Attachment 'merge-reint-1.txt'

Download

   1 [graph]
   2 title = Reintegrate Merge: CC vs SVN
   3 branches = [
   4   ('A', 'O0', 1, 5),
   5   ('O', None, 0, 0),
   6   ('B', 'O0', 1, 4),
   7   ]
   8 changes = [
   9   'O0', 'A1', 'A2', 'A5',
  10   'B1', 'B3', 'B4',
  11   ]
  12 merges = [
  13   ('O0', 'A2', 'B3', 'sync'),
  14   ('A2', 'B4', 'A5', 'reint'),
  15   ]
  16 annotations = [
  17   ('O0', "m'info base"),
  18   ('A2', '3-way base'),
  19   ('A5', 'merged B:1-4'),
  20   ]

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.

You are not allowed to attach a file to this page.