How do I tell FileMerge to remember my settings about the bottom pane?

340 Views Asked by At

A few years ago, someone asked how they could get the bottom pane in FileMerge back. The answer was that FileMerge remembered your settings, and if you'd accidentally resized the bottom pane to take up no space at all, it would faithfully be invisible again next time you opened FileMerge.

Yosemite has changed that behaviour, and I want it back. I have no interest in the bottom pane. It takes up space that I'd rather have for the before and after left and right panes. And every time I click on a changed file in Gitbox I have to resize that annoying bottom pane out of the window before I can look at the diff properly.

Any ideas? "No, they've broken FileMerge but this other free Mac OS X tool does what you want and Gitbox can launch it with only a minimum of fuss" would be an acceptable alternate answer.

1

There are 1 best solutions below

2
On

Since my version control tool uses a shell script behind the scenes to open FileMerge, I was able to use the setting described here to hide the merge pane: https://ftangftang.wordpress.com/2015/02/23/filemerge-bug/

It's not an ideal solution, but was hoping it would suffice until Apple fixes the problem.

My updated git-diff-cmd.sh script:

#!/bin/sh
defaults write com.apple.FileMerge MergeHeight 0
/usr/bin/opendiff "$2" "$5" -merge "$1"