D 2010-10-15T07:47:28
J comment I\sdo\sa\sfossil\supdate,\sand\sam\sreported\sa\sfile\sis\sin\sconflict:\r\n\r\n$\sfossil\sup\r\n\r\nMERGE\shello.txt\r\n\r\n*****\s1\smerge\sconflicts\sin\shello.txt\r\n\r\nbut\sthen\swhen\sI\sdo\sfossil\sst:\r\n\r\n$\sfossil\sst\r\n\r\n...\r\n\r\nEDITED\s\s\s\s\shello.txt\r\n\r\nIf\sI\shad\sa\slong\slist\sof\sfiles,\sI\swould\slike\sto\sknow\swhich\sones\sare\sin\sconflict\sand\swhich\snot.
J foundin b48f78964e
J private_contact fbbc887beb8da03d2f38921a58bf0501ff03b2dc
J severity Important
J status Open
J title Files\sin\sconflict\sare\snot\smarked\sas\sso
J type Code_Defect
K 24e1e78fa301399e5711c3786594819445694668
U anonymous
Z 7127bca07a7dd3669ab72b491003816c