Chris Lamb wrote:
 
> >  - There is a desire to get 3-way merge support. This is currently
> >    just unreliable, as we do not keep all the information required.
> >    I'd rather not spend time on this until the conffiledb work is
> >    merged, which I just need to sit down and do. :)
> 
> Is there an ETA on this, just out of interest?
> 
> This feature seems like a fun problem to hack on, after all but
> wouldn't want to get in your way or expend energy generating yet
> another patch that won't ever be merged.

Gentle ping on this? :)


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      [email protected] / chris-lamb.co.uk
       `-

Reply via email to