Mercurial > dotfiles

diff git/gitconfig @ 393:8bf3eed26496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 22 Aug 2017 13:11:51 -0700
parents ff48d206d1f1
children 4cbf9f8b4a37
line wrap: on
line diff
--- a/git/gitconfig	Tue Aug 22 13:08:15 2017 -0700
+++ b/git/gitconfig	Tue Aug 22 13:11:51 2017 -0700
@@ -12,3 +12,9 @@
 
 [include]
 path = gitconfig-local
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true