Should "git mergetool" work to diff a conflicted file?

Printable View