Subscribe

3 panes, 4 files - merge

  1. 2012-12-21 13:06:43 PST
    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)?
  2. 2013-03-13 19:32:43 PDT
    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.
Jump To:
< Previous | 1 | Next >

Add a Reply

This forum does not allow anonymous participation.

Log in to add a reply. Not registered? Create an account to participate and receive email updates when replies are posted to this topic.