# HG changeset patch
# User The Geek Inside <thegeek@thegeekinside.net>
# Date 1324322034 21600
# Node ID 5ef7a31d4d9fae74685b0a6e0d7c9bdef1658ef6
# Parent  b1f6f472c05d624d22d44b1d01e15a5c463ca42e
Deactivate emacs toolbar and add Source Tree as merge tool in Git.

diff -r b1f6f472c05d624d22d44b1d01e15a5c463ca42e -r 5ef7a31d4d9fae74685b0a6e0d7c9bdef1658ef6 emacs/emacs
--- a/emacs/emacs	Tue Nov 01 12:33:40 2011 -0600
+++ b/emacs/emacs	Mon Dec 19 13:13:54 2011 -0600
@@ -21,6 +21,7 @@
 (setq auto-save-default nil) ; stop creating those #autosave# files
 (setq delete-by-moving-to-trash t) ; deleting files goes to OS's trash folder
 (setq inhibit-startup-echo-area-message t) ; don't show the startup message
+(tool-bar-mode 0)  ; deactivate the toolbar
 
 ;; SSH support
 (require 'ssh)
@@ -77,8 +78,8 @@
 ;; (require 'color-theme-tango)
 ;; (color-theme-tango)
 
-;; (require 'color-theme-tangotango)
-;; (color-theme-tangotango)
+(require 'color-theme-tangotango)
+(color-theme-tangotango)
 
 ;; (require 'color-theme-inspiration-matrix)
 ;; (color-theme-inspiration-matrix)
@@ -89,8 +90,8 @@
 ;; (require 'color-theme-inspiration-tgi-dark)
 ;; (color-theme-inspiration-tgi-dark)
 
-;;(require 'color-theme-twilight)
-;;(color-theme-twilight)
+;; (require 'color-theme-twilight)
+;; (color-theme-twilight)
 
 ;; (require 'color-theme-gruber-darker)
 ;; (color-theme-gruber-darker)
diff -r b1f6f472c05d624d22d44b1d01e15a5c463ca42e -r 5ef7a31d4d9fae74685b0a6e0d7c9bdef1658ef6 git/gitconfig
--- a/git/gitconfig	Tue Nov 01 12:33:40 2011 -0600
+++ b/git/gitconfig	Mon Dec 19 13:13:54 2011 -0600
@@ -7,3 +7,9 @@
 tool = deltawalker
 [mergetool  "deltawalker"]
 cmd = "/Applications/DeltaWalker.app/Contents/MacOS/bzr-git-merge" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
+[difftool "sourcetree"]
+	cmd = /Applications/DeltaWalker.app/Contents/MacOS/dw $local $remote
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/DeltaWalker.app/Contents/MacOS/dw $local $remote $base -merged=$output
+	trustExitCode = true