Hi, Just a silly remark about the "0 conflicts encountered." of bzr pull. conflict_s_ should be singular. Actually, what's disturbing me is that I tend to look quickly at the message and read "conflicts encountered". Perhaps it would be better to show no message at all when no conflict occur. My 2cents, -- Matthieu