[Kdiff3-user] feature request to keep parallel adds

[Florian S. <fl...@sp...>]

hi all,

first of all, i'd like to thank you for this great app! i use it at work 
to resolve conflicts when working with subversion, and k3diff helps a 
lot. keep up the good work!

occasionally, i have conflicting changes where i'd like to keep both. 
e.g. i've added a new statement in line 14, and someone else added a 
different new statement at line 14 at the same time. when merging, i'd 
like to keep both lines. in the context menu of a <Merge Conflict>, i 
can only choose "Select Line(s) from A" or "Select Line(s) from B", but 
i'd like to "Keep Line(s) from A before B" or "Keep Line(s) from B 
before A".

additionally, if the conflicting add operations span over several lines, 
this choice should be possible on a per-line basis (instead of a 
per-conflict basis).

afaik, tortoise merge offers such functionality; it would be nice to 
have it available in kdiff3 as well :-)

cheers,
florian