Gity should not offer to resolve conflicts with FileMerge for unsupported file types #3
Description
Binary file conflicts and submodule conflicts should not have an option for resolving via FileMerge. For submodule conflicts, this actually results in the app crashing. Ideally in these scenarios you would be able to choose which version of the file (or submodule revision) you want to keep.