Skip to content
Browse files

Use Kaleidoscope as diff tool

  • Loading branch information...
1 parent bff1232 commit 18fa707eaeb931a37ea74d4a752b287e0d9975e9 @cypher committed Jun 1, 2010
Showing with 7 additions and 2 deletions.
  1. +4 −0 gitconfig
  2. +3 −2 hgrc
View
4 gitconfig
@@ -75,6 +75,7 @@
[diff]
renames = true
mnemonicprefix = true
+ tool = Kaleidoscope
[difftool]
prompt = false
@@ -124,3 +125,6 @@
[git-tmbundle]
gitx-path = /usr/local/bin/gitx
+
+[difftool "Kaleidoscope"]
+ cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
View
5 hgrc
@@ -8,10 +8,11 @@ annotate = --user --changeset
cdiff = -q
[extdiff]
-cmd.cdiff = colordiff
-opts.cdiff = -uprN
+cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
+opts.ksdiff = hg
[extensions]
#fetch =
#hgext.mq =
#transplant =
+hgext.extdiff =

0 comments on commit 18fa707

Please sign in to comment.
Something went wrong with that request. Please try again.