Mercurial > dotfiles
comparison git/gitconfig-MacOSX @ 454:54bdd1f0f873
Make OS-specific configs for Git.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 13 Nov 2018 09:55:24 -0800 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
453:97a94dacfd54 | 454:54bdd1f0f873 |
---|---|
1 | |
2 [difftool "sourcetree"] | |
3 cmd = opendiff \"$LOCAL\" \"$REMOTE\" | |
4 path = | |
5 [mergetool "sourcetree"] | |
6 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
7 trustExitCode = true | |
8 | |
9 # vim:ft=gitconfig:ts=2:sw=2 |