# HG changeset patch # User Steve Losh # Date 1277492842 14400 # Node ID 21d16bafb00b0758b5a5d28a03da94378233cb61 # Parent 65c514961585620a8459bef8d608568aca57ae3b git: add Kaleidoscope as a difftool diff -r 65c514961585 -r 21d16bafb00b .gitconfig --- a/.gitconfig Sun Jun 20 14:09:32 2010 -0400 +++ b/.gitconfig Fri Jun 25 15:07:22 2010 -0400 @@ -26,3 +26,9 @@ diff = auto interactive = auto status = auto +[difftool "Kaleidoscope"] + cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" +[difftool] + prompt = false +[diff] + tool = Kaleidoscope