id	summary	reporter	owner	description	type	status	priority	milestone	component	version	severity	resolution	keywords	cc
85	Support resolving conflicts	apaku	alwin	"Hi,

I'd really like to see kdesvn support the resolving of conflicts after an update or merge. Currently I have to open my editor and look for the >>>>, but it would be really nice if kdesvn offerend a 3-part view with my local version of the file, the version that comes from the repository (or merge) and the ""outcome"" of what I'd like to do.

Andreas"	enhancement	closed	normal	0.14.x	All	0.14.x	feature	fixed