Gordon Woodhull gordonwoodhull

Download and install p4merge

Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool

Each of these commands will run an ad hoc http static server in your current (or specified) directory, available at http://localhost:8000. Use this power wisely.

Discussion on reddit.

Python 2.x

$ python -m SimpleHTTPServer 8000

	[merge]
	keepBackup = false
	tool = custom

	[mergetool "custom"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

	// CSS Color Names
	// Compiled by @bobspace.
	//
	// A javascript object containing all of the color names listed in the CSS Spec.
	// This used to be a big array, but the hex values are useful too, so now it's an object.
	// If you need the names as an array use Object.keys, but you already knew that!
	//
	// The full list can be found here: https://www.w3schools.com/cssref/css_colors.asp
	// Use it as you please, 'cuz you can't, like, own a color, man.

	@mixin no-select {
	-webkit-touch-callout: none;
	-webkit-user-select: none;
	-khtml-user-select: none;
	-moz-user-select: none;
	-ms-user-select: none;
	user-select: none;
	}