So I was merging some files today with Git and I happened to notice that the default install of git from macports has opendiff/FileMerge.app as its default merge tool. For about five minutes I could not figure out how to use it, because frankly the interface and docs suck. So for the benefit of web [...]
Archives