view hgrc/hgrc-MacOSX @ 176:c6a072353606

Vim config changes: * Better working dir management in `vimrc`. * Better shortcuts for NERDTree and CtrlP. * Misc stuff.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 20 Jul 2014 17:43:25 -0700
parents d190d7987730
children 7d83a5eab234
line wrap: on
line source

[ui]
ssh = ssh -C
merge = kdiff3

[extdiff]
cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3

[merge-tools]
kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3
kdiff3.args = $base $local $other -o $output