id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
4601	Conflict list dialog won't update unless I prod it	avarab@…	team	"I've run into multiple instances where the conflict dialog didn't update.

 * A warning box says I have 10 conflicts but the dialog has nothing, but it appears when i minimize/maximize it
 * I have 50 conflicts, solve 5 interactively, the number doesn't change to 45 until I prod it again."	defect	closed	major		Core	latest	fixed	conflict list