Brett Profitt brettp

mrenouf / git_merge_meld.sh

Created September 28, 2011 10:09

Merge helper script for using 'git mergetool' with meld, fixes http://stackoverflow.com/questions/7501666/

	#!/bin/bash

	# Handles proper use of Meld from Git.
	#
	# Instead of launching meld with $MERGED as the base revision, this
	# script makes a copy of $BASE and handles copying the result back
	# to $MERGED if the result was saved.

	# As an extra tweak, it also presents branch names (if known) as
	# the file name prefix, instead of just "LOCAL" and "REMOTE".