<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /var/www/jonas-eriksen.dk/pic/private/index.php:1) in <b>/var/www/jonas-eriksen.dk/pic/private/index.php</b> on line <b>215</b><br />
diff_cmd () {
	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}

diff_cmd_help () {
	echo "Use Sublime Merge (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
	else
		"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
	fi
}

merge_cmd_help () {
	echo "Use Sublime Merge (requires a graphical session)"
}