diff options
Diffstat (limited to 'tests/test-pearl-conflict.el')
| -rw-r--r-- | tests/test-pearl-conflict.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-pearl-conflict.el b/tests/test-pearl-conflict.el index 03d8f31..138e622 100644 --- a/tests/test-pearl-conflict.el +++ b/tests/test-pearl-conflict.el @@ -212,7 +212,7 @@ (cl-letf (((symbol-function 'pearl--read-conflict-resolution) (lambda (_) 'rewrite)) ;; Emulate the user resolving the buffer and committing. ((symbol-function 'pearl--resolve-conflict-in-smerge) - (lambda (_label _local _remote on-finish) + (lambda (_label _local _remote on-finish &optional _on-abort) (funcall on-finish "merged text")))) (pearl--resolve-conflict "ENG-1 description" "local text" "remote text" marker "LINEAR-DESC-SHA256" |