Alexander Murphy thexande

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.

	#!/bin/bash

	#
	# Use agvtool to set Xcode project build number and create git tag
	# Note: requires Xcode project configured to use Apple Generic Versioning and git
	#
	# Usage: set_agv_ver.sh 123
	#
	# src: https://gist.github.com/rob-murray/8644974
	#

	#!/bin/sh

	# check for where the latest version of IDEA is installed
	IDEA=`ls -1d /Applications/IntelliJ\ * \| tail -n1`
	wd=`pwd`

	# were we given a directory?
	if [ -d "$1" ]; then
	# echo "checking for things in the working dir given"
	wd=`ls -1d "$1" \| head -n1`

	function format_time(date_obj) {
	// formats a javascript Date object into a 12h AM/PM time string
	var hour = date_obj.getHours();
	var minute = date_obj.getMinutes();
	var amPM = (hour > 11) ? "pm" : "am";
	if(hour > 12) {
	hour -= 12;
	} else if(hour == 0) {
	hour = "12";
	}

	// Crop a UIImage to the specified cropRect
	public UIImage CropImage(UIImage image, RectangleF cropRect)
	{
	UIGraphics.BeginImageContextWithOptions(cropRect.Size, false, 0);
	var context = UIGraphics.GetCurrentContext();

	context.TranslateCTM(0.0f, image.Size.Height);
	context.ScaleCTM(1.0f, -1.0f);
	context.DrawImage(new RectangleF(0, 0, image.Size.Width, image.Size.Height), image.CGImage);
	context.ClipToRect(cropRect);