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