Mercurial > dotfiles
comparison hgrc/hgrc-MacOSX @ 132:d190d7987730
Use `kdiff3` for merging on MacOS.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Thu, 26 Sep 2013 22:34:57 -0700 |
| parents | 766520c00625 |
| children | 7d83a5eab234 |
comparison
equal
deleted
inserted
replaced
| 131:a273867b6a0d | 132:d190d7987730 |
|---|---|
| 1 [extdiff] | |
| 2 cmd.opendiff = opendiff-w | |
| 3 opts.opendiff = | |
| 4 | |
| 5 [ui] | 1 [ui] |
| 6 ssh = ssh -C | 2 ssh = ssh -C |
| 3 merge = kdiff3 | |
| 7 | 4 |
| 5 [extdiff] | |
| 6 cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3 | |
| 7 | |
| 8 [merge-tools] | |
| 9 kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3 | |
| 10 kdiff3.args = $base $local $other -o $output | |
| 11 |