Use Tools|Conflict Solver to start a Three-Way-Merge, which can be invoked on conflicting files (see Common Primary File States). For details, refer to Conflict Solver.
When invoking this command on a binary file, it will bring the Mark Resolved dialog.