Binary mergesNext internal release will have an small but important improvement... binary merges!
We were basically handling that from the command line since we are using the product internally to handle our development (four months already), but now we have (yes, finally...) a **real** solution.
The screenshot shows the tool looks and functionality. You can basically choose one of the three revisions: ancestor, source or destination.
The icons are taken from the GUI tool, so they will be replaced as soon as possible.