From 27789e5f3dc188355e79ef671cd20c332afb9fa8 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 12 Mar 2013 11:00:44 -0700 Subject: [PATCH] Remove duplicate difftool entry for Kaleidoscope --- gitconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/gitconfig b/gitconfig index ca8c981..c317f08 100644 --- a/gitconfig +++ b/gitconfig @@ -60,8 +60,6 @@ prompt = false [difftool] prompt = false -[difftool "Kaleidoscope"] - cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [mergetool "Kaleidoscope"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true