How to get my git-integrated Kaleidoscope to display all files that are about to be committed?

user_455016 0
Viewed 5815

I'm using command-line git and Kaleidoscope to perform my code reviews. When I merge a branch into another and type

git difftool

Kaleidoscope only displays changes that are 'not staged for commit' and don't display 'unmerged paths' or 'changed to be committed'.

The command-line displays the rest of the stuff.

Any idea why?

This is the relevant content of my .gitconfig

[difftool "Kaleidoscope"]
        cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[diff]
        tool = Kaleidoscope
[difftool]
        prompt = false
diff git
2 Answers
Related