Is there a way to get back the buttons in both directions (i.e., unhide the buttons from middle-to-left and middle-to-right), which DevArt considered to be 'redundant'?Redundant buttons for the changes transfer were removed to visually simplify the merging process and minimize a chance of casual changes transfer to the wrong file.
If not, I have a problem because I can no longer merge the way I was used to.
My scenario 1: sometimes I have two versions of some piece of code (for example a method or an entire file), which are different enough to be not-so-easy to merge without a tool. I want to 'repeat' the edits I did to version A into version B. I would do this by pasting the A-pre- and A-post-edit into two of the three panes and B into the remaining pane. Even when all buttons were still there, it was a bit hard to arrange the panes so I could see the edits in A and at the same time process them one-by-one into B. Sometimes I would need to swap the panes, etc. But now I don't see a way to do this. I'm forced to put B in the center because the buttons only go there, so the A-pre and A-post have to be on the far left and far right, so CC does not display the diffs between them (the middle pane is in between ).
The options I can see:
- Get back the arrow buttons in both-directions.
- Manipulate CC into doing 'real' 3-way merging, where actually there are 4 files involved (A, B, Base and Result). This would be the nicest. I use that mode when CC is invoked from the IDE during version control merges. Then the IDE takes care of invoking CC with the correct command line arguments. But for my ad hoc actions, I'd need to save three fragments to disk first, then construct some long command line, etc.
Am I missing something?