why doen't conflict diffs load on Filemerge, when other diffs do?

I have GIT set up to load Diffs in filemerge, but when there are conflicts, it just prints the diff to terminal.

Is there a way around this, 开发者_如何学Pythonor a better app to handle conflicts?

Simple, look into 'git mergetool' to configure a graphical editor to be able to handle the conflicts.