There is no output when there is a merge conflict

[dandavison]

There's been a regression:

$ git --no-pager diff
diff --cc jedi-core.el
index d341cb4,37ad68d..0000000
--- a/jedi-core.el
+++ b/jedi-core.el
@@@ -928,8 -861,10 +928,19 @@@ It must take these arguments: (file-to-
            (message "File '%s' does not exist." module_path)))
         (t
          (jedi:goto-definition-push-marker)
++<<<<<<< HEAD
 +        (jedi:find-file module_path line_nr column other-window)
 +        (run-hooks 'jedi:goto-definition-hook)
++||||||| parent of 124d30d... Add jedi:goto-definition-hook
++        (funcall (if other-window #'find-file-other-window #'find-file)
++                 module_path)
++        (jedi:goto--line-column line_nr column)
++=======
+         (funcall (if other-window #'find-file-other-window #'find-file)
+                  module_path)
+         (jedi:goto--line-column line_nr column)
+         (run-hooks 'jedi:goto-definition-hook)
++>>>>>>> 124d30d... Add jedi:goto-definition-hook
          (jedi:goto-definition--notify-alternatives len n))))))
  
  (defun jedi:goto-definition--notify-alternatives (len n)

$ git --no-pager diff | delta

comparing: a/jedi-core.el ⟶   b/jedi-core.el
───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
$