D 2011-01-18T15:45:01.472 J comment When\supdating\sa\slarger\stree\swith\smany\schanges,\sthe\sfossil\supdate\soutput\scan\sbe\smultiple\spages\slong.\sAt\sthe\send,\sit\sprints\s"WARNING:\smerge\sconflicts\s-\ssee\smessages\sabove\sfor\sdetails."\sif\sthere\sare\sany\sconflicts.\sIt\swould\smake\sit\seasier\sto\salso\stell\show\smany\sfiles\sactually\shad\sa\sconflict,\sso\sthat\sscanning\sthe\slist\sis\smore\sefficient\sand\sless\slikely\sto\sjust\smiss\san\sitem. J foundin 66d93f33d5 J private_contact 63070188043a9522ca95dca0d28c3b9eff7a697b J severity Minor J status Open J title Show\snumber\sof\sconflicts\sat\sthe\send\sof\s"fossil\supdate" J type Feature_Request K 769b4ed7b23e4cb72f8958b3a34bdc12f8dd2155 U anonymous Z 696fdb8713393925de2189512bebc001