Commits

Ryan Wilcox committed 8e2dbb7

sourcetree changes

  • Participants
  • Parent commits 137b929

Comments (0)

Files changed (1)

File gitconfig.rc

 	pl = pull github master
 	ls = diff --numstat
 [difftool "sourcetree"]
-	cmd = /usr/local/bin/bbdiff --resume --reverse --wait \"$LOCAL\" \"$REMOTE\"
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path = 
 [mergetool "sourcetree"]
-	cmd = /Users/rwilcox/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
 [branch]
 	autosetupmerge = true