D 2011-08-30T07:58:20.550
J comment I\shave\sa\sbranch\swhere\sI\shave\smodified\s<code>a.cpp</code>.\sIf\sin\strunk\ssomeone\sdeleted\sthat\sfile,\sand\sI\srun\s<code>fossil\supdate\strunk</code>,\sfossil\swill\ssilently\smerge\sthe\sbranch\smodifications\sand\sthe\strunk\sdelete\ssilently\sinto\sa\sfile\sdelete.\r\n\r\nFossil\sshould\sreport\sthis\sas\sa\sconflict.
J foundin 1.18
J status Open
J title Troubles\smerging\sa\sfile\sdelete\swith\sa\sfile\schange
J type Code_Defect
K 4df5f38f1e564d2970c269bf5ea1d2aec5173dc9
U viriketo
Z 142fedfed6679883c8e7e50d27b58924