jandrewthompson/kdiff3svn

Created September 18, 2013 19:42

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/jandrewthompson/6614471.js"></script>
Save jandrewthompson/6614471 to your computer and use it in GitHub Desktop.

Download ZIP

Script for helping SVN and kdiff3 play nicely

Raw

	#!/bin/bash
	#################
	# set 'merge-tool-cmd = kdiff3svn' in ~/.subversion/config
	# ###############

	kdiff3 $1 $2 $3 -o $4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment