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

Question

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, or a better app to handle conflicts?

I'm just using `git diff`, which is what I usually use to launch Filemerge to see diffs — Mild Fuzz, Jun 12 '11 at 19:20

score 1 · Accepted Answer · answered Jul 21 '11 at 09:15

1

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

answered Jul 21 '11 at 09:15

Sardaukar

1 Answers1