[ben-schaaf]

Yes it does. It gets used for resolving merge conflicts, but it can also be used as a separate tool: https://www.sublimemerge.com/docs/command_line