Artifact 4685cf049d6ba0159cc3c589177bcb1f5b5687cc:

Ticket change [4685cf049d] - New ticket [98b63bd316] 3-way merge drops line. by anonymous 2009-02-16 11:01:31.

---

D 2009-02-16T11:01:31
J comment I\snoticed\sthat\sduring\sa\smerge\sa\sline\sfrom\sthe\sbranch\sI\swas\smerging\sfrom\swas\smissing\sbetween\sthe\sconflict\smarkers.\sA\sbit\sof\sanalysis\sgave\sme\sthe\stest\scase\sgenerated\sby\sa\sshell\sscript\sat\sthe\send\sof\sthis\sticket.\r\n\r\nNote\sthan\sthe\sline\scontaining\s<b>'f'</b>\sin\sv1\sis\scompletely\smissing\sin\sthe\smerge\sresult.\sAlso,\sthe\sline\scontaining\s<b>'a'</b>\sshould\seither\sappear\sonce\soutside\sor\stwice\sinside\sthe\sconflict\smarkers.\r\n\r\n<verbatim>\r\n#!/bin/sh\r\nfor\sl\sin\s1\s2\s3\s4\s5\s6\s7\s8\s9;\sdo\secho\s$l;\sdone\s>\sbase\r\nfor\sl\sin\s1\s2\s3\s4\s5\sa\sb\sc\sd\se\sf\s6\s7\s8\s9;\sdo\secho\s$l;\sdone\s>\sv1\r\nfor\sl\sin\s1\s2\s3\s4\s5\sa\sb\sc\sx\sy\sz\s6\s7\s8\s9;\sdo\secho\s$l;\sdone\s>\sv2\r\nfossil\stest-3-way-merge\sbase\sv1\sv2\sresult\r\n</verbatim>
J foundin bc857ecd92
J private_contact 6984f5ff2d3f66a87d3c6ddcf777c37b54e478f0
J severity Severe
J status Open
J title 3-way\smerge\sdrops\sline
J type Code_Defect
K 98b63bd31671500627c21c1d28326057e0fc93d2
U anonymous
Z c9073b827d73e7b76650f37db628cb75