search

travi / dotfiles

My disaster recovery plan.
21 stars 6 forks source link

git mergetool for mac #71

Closed travi closed 8 years ago

travi commented 9 years ago

http://www.git-tower.com/blog/diff-tools-mac/

travi commented 9 years ago

perforce merge tool: http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools

https://gist.github.com/tony4d/3454372

travi commented 9 years ago

need to determine an acceptable way to conditionally load os specific configs such as ~/.gitconfig.osx and ~/.gitconfig.win

it appears that

path = "!if [[ "$OSTYPE" == darwin* ]]; then OS_CONFIG='~/.gitconfig.osx'; else OS_CONFIG='~/.gitconfig.win'; fi; $OS_CONFIG"

does not get executed