sublime_merge icon indicating copy to clipboard operation
sublime_merge copied to clipboard
verified publisher icon sublimehq

Cannot handle zdiff3

Open michaelblyons opened this issue 1 year ago • 0 comments

Version info

  • OS: MacOS
  • Build: 2095?

Description

When I set my merge conflict style to zdiff3, I can no longer handle merge conflicts in SM. There's a warning pop-up in the notification area.

Steps to reproduce

Steps to reproduce the behavior:

  1. git config merge.conflictStyle zdiff3
  2. Provoke a merge conflict
  3. git mergetool

Expected behavior

SM is at the conflict summary screen, ready to resolve files.

michaelblyons avatar Aug 16 '24 16:08 michaelblyons