update packages

lisp/magit/magit-merge.el

@@ -1,6 +1,6 @@
 ;;; magit-merge.el --- merge functionality  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2010-2020  The Magit Project Contributors
+;; Copyright (C) 2010-2021  The Magit Project Contributors
 ;;
 ;; You should have received a copy of the AUTHORS.md file which
 ;; lists all contributors.  If not, see http://magit.vc/authors.
@@ -47,7 +47,8 @@
    ("-f" "Fast-forward only" "--ff-only")
    ("-n" "No fast-forward"   "--no-ff")
    (magit-merge:--strategy)
-   (5 magit-diff:--diff-algorithm :argument "--Xdiff-algorithm=")
+   (5 magit-merge:--strategy-option)
+   (5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
    (5 magit:--gpg-sign)]
   ["Actions"
    :if-not magit-merge-in-progress-p
@@ -78,6 +79,13 @@
   :argument "--strategy="
   :choices '("resolve" "recursive" "octopus" "ours" "subtree"))
 
+(transient-define-argument magit-merge:--strategy-option ()
+  :description "Strategy Option"
+  :class 'transient-option
+  :key "-X"
+  :argument "--strategy-option="
+  :choices '("ours" "theirs" "patience"))
+
 ;;;###autoload
 (defun magit-merge-plain (rev &optional args nocommit)
   "Merge commit REV into the current branch; using default message.