Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

3 panes, 4 files - merge

Help
2012-12-21
2013-05-28
  • Guy Kroizman
    Guy Kroizman
    2012-12-21

    Hi,
    I looked in the docs and google but could not find the answer.
    Can diffuse do 3-way merge in which it gets the 4 files? and display it in three panes (the output pane across the bottom)?

     
  • Derrick Moser
    Derrick Moser
    2013-03-14

    Currently there is no explicit merge pane at the bottom but this feature is high on our to-do list.  Right now, Diffuse treats all panes as equal peers.  Usually the second pane is were merging work is performed.