Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

opendiff (FileMerge) on OS X: choose left by default

Can I configure this tool to default the choice for each differing block to the left side rather than the right side?

Right now the workaround is to swap the sides, but this is slightly confusing.

like image 284
Steven Lu Avatar asked Dec 23 '13 18:12

Steven Lu


People also ask

How do I use FileMerge on Mac?

But you can also use FileMerge to actually merge the two folders together into one new one. To do this, select all the files in the leftmost column (click on one and then hit Command-A to select all). Then select Combine Files from the Merge pop-up menu (or press Command-1).

What is Opendiff?

opendiff is a command line utility that provides a convenient way to launch the FileMerge application from Terminal to graphically compare files or directories. If FileMerge is already running, opendiff will connect to that running instance for the new comparison.


1 Answers

Not sure I understand what you want to do, but perhaps the following will help. In the FileMerge.app UI, as soon as the file comparison window opens, you can press Cmd+A to select all the differences (arrows), then press the left arrow key to change them all to the Original file contents. You can then press the up arrow to return to the first change (ignore the NSBeep()). Then use the down arrow to cycle down through the diffs and if there's one where you want to change to the "new" content that's showing on the right side, press the right arrow.

like image 119
NSGod Avatar answered Sep 28 '22 09:09

NSGod