;ELC   
;;; Compiled
;;; in Emacs version 26.3
;;; with all optimizations.

;;; This file uses dynamic docstrings, first added in Emacs 19.29.

;;; This file does not contain utf-8 non-ASCII characters,
;;; and so can be loaded in Emacs versions earlier than 23.

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


(byte-code "\300\301!\210\300\302!\207" [require magit magit-diff] 2)
(defalias 'magit-merge #[0 "\300\301!\207" [transient-setup magit-merge] 2 nil nil])
(byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314&#\210\300\301\315\316#\207" [put magit-merge interactive-only t function-documentation "Merge branches." transient--prefix transient-prefix :command :man-page "git-merge" :incompatible (("--ff-only" "--no-ff")) transient--layout ([1 transient-column (:description "Arguments" :if-not magit-merge-in-progress-p) ((1 transient-switch (:key "-f" :description "Fast-forward only" :argument "--ff-only" :command transient:magit-merge:--ff-only)) (1 transient-switch (:key "-n" :description "No fast-forward" :argument "--no-ff" :command transient:magit-merge:--no-ff)) (1 transient-suffix (:command magit-merge:--strategy)) (5 transient-suffix (:command magit-diff:--diff-algorithm :argument "--Xdiff-algorithm=")) (5 transient-suffix (:command magit:--gpg-sign)))] [1 transient-columns (:description "Actions" :if-not magit-merge-in-progress-p) ([1 transient-column nil ((1 transient-suffix (:key "m" :description "Merge" :command magit-merge-plain)) (1 transient-suffix (:key "e" :description "Merge and edit message" :command magit-merge-editmsg)) (1 transient-suffix (:key "n" :description "Merge but don't commit" :command magit-merge-nocommit)) (1 transient-suffix (:key "a" :description "Absorb" :command magit-merge-absorb)))] [1 transient-column nil ((1 transient-suffix (:key "p" :description "Preview merge" :command magit-merge-preview)) "" (1 transient-suffix (:key "s" :description "Squash merge" :command magit-merge-squash)) (1 transient-suffix (:key "i" :description "Merge into" :command magit-merge-into)))])] [1 transient-column (:description "Actions" :if magit-merge-in-progress-p) ((1 transient-suffix (:key "m" :description "Commit merge" :command magit-commit-create)) (1 transient-suffix (:key "a" :description "Abort merge" :command magit-merge-abort)))])] 10)
(defalias 'magit-merge-arguments #[0 "\300\301!\207" [transient-args magit-merge] 2])
(defalias 'magit-merge:--strategy #[0 "\300 \301\302!\"\266\303 \207" [transient-suffix-object transient-infix-set transient-infix-read transient--show] 5 nil nil])
(byte-code "\300\301\302\303#\210\300\301\304\305#\210\300\301\306\307\310\301\311\312\313\314\315\316\317\320&\n#\207" [put magit-merge:--strategy interactive-only t function-documentation nil transient--suffix transient-option :command :description "Strategy" :key "-s" :argument "--strategy=" :choices ("resolve" "recursive" "octopus" "ours" "subtree")] 14)
#@409 Merge commit REV into the current branch; using default message.

Unless there are conflicts or a prefix argument is used create a
merge commit using a generic commit message and without letting
the user inspect the result.  With a prefix argument pretend the
merge failed to give the user the opportunity to inspect the
merge.

(git merge --no-edit|--no-commit [ARGS] REV)

(fn REV &optional ARGS NOCOMMIT)
(defalias 'magit-merge-plain #[769 "\300 \210\301\302\203 \303\202 \304$\207" [magit-merge-assert magit-run-git-async "merge" "--no-commit" "--no-edit"] 8 (#$ . 3058) (byte-code "\301\302!\303 E\207" [current-prefix-arg magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 3)])
#@198 Merge commit REV into the current branch; and edit message.
Perform the merge and prepare a commit message but let the user
edit it.

(git merge --edit --no-ff [ARGS] REV)

(fn REV &optional ARGS)
(defalias 'magit-merge-editmsg #[513 "\300 \210\301\235\203 \211\202 \301B\262\302\303\304\305\306\307\310\"C\"$\207" [magit-merge-assert "--no-ff" apply magit-run-git-with-editor "merge" "--edit" append delete "--ff-only"] 10 (#$ . 3770) (byte-code "\300\301!\302 D\207" [magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 2)])
#@244 Merge commit REV into the current branch; pretending it failed.
Pretend the merge failed to give the user the opportunity to
inspect the merge and change the commit message.

(git merge --no-commit --no-ff [ARGS] REV)

(fn REV &optional ARGS)
(defalias 'magit-merge-nocommit #[513 "\300 \210\301\235\203 \211\202 \301B\262\302\303\304$\207" [magit-merge-assert "--no-ff" magit-run-git-async "merge" "--no-commit"] 7 (#$ . 4326) (byte-code "\300\301!\302 D\207" [magit-read-other-branch-or-commit "Merge" magit-merge-arguments] 2)])
#@467 Merge the current branch into BRANCH and remove the former.

Before merging, force push the source branch to its push-remote,
provided the respective remote branch already exists, ensuring
that the respective pull-request (if any) won't get stuck on some
obsolete version of the commits that are being merged.  Finally
if `forge-branch-pullreq' was used to create the merged branch,
branch, then also remove the respective remote branch.

(fn BRANCH &optional ARGS)
(defalias 'magit-merge-into #[513 "\300 \301\302\"\303U\205 \304\"\207" [magit-get-current-branch magit-call-git "checkout" 0 magit--merge-absorb] 6 (#$ . 4872) (byte-code "\300\301\302\303 \"\304\305 \211\205 \306!A\211\205 \307!\205 \211\266\202#\310 D\207" [magit-read-other-local-branch format "Merge `%s' into" magit-get-current-branch nil magit-get-upstream-branch magit-split-branch-name magit-branch-p magit-merge-arguments] 7)])
#@459 Merge BRANCH into the current branch and remove the former.

Before merging, force push the source branch to its push-remote,
provided the respective remote branch already exists, ensuring
that the respective pull-request (if any) won't get stuck on some
obsolete version of the commits that are being merged.  Finally
if `forge-branch-pullreq' was used to create the merged branch,
then also remove the respective remote branch.

(fn BRANCH &optional ARGS)
(defalias 'magit-merge-absorb #[513 "\300\"\207" [magit--merge-absorb] 5 (#$ . 5792) (byte-code "\300\301!\302 D\207" [magit-read-other-local-branch "Absorb branch" magit-merge-arguments] 2)])
#@20 

(fn BRANCH ARGS)
(defalias 'magit--merge-absorb #[514 "\301\232\203 \302\303!\204 \304\305!\210\306\307\"\211\2034 \310\311C#\210\312\313\314\315\316\317		\"\320\"\321\322%\"\2028 \323\"\207" [magit-this-process "master" yes-or-no-p "Do you really want to merge `master' into another branch? " user-error "Abort" magit-get-push-branch t magit-git-push "--force-with-lease" set-process-sentinel make-byte-code 514 "\302!\303>\205$ \304!\305U\204 \306\"\207\307\310\311#\210\306\"\210\312\300\301\"\207" vconcat vector [process-status (exit signal) process-exit-status 0 magit-process-sentinel process-put inhibit-refresh t magit--merge-absorb-1] 6 "\n\n(fn PROCESS EVENT)" magit--merge-absorb-1] 12 (#$ . 6451)])
#@20 

(fn BRANCH ARGS)
(defalias 'magit--merge-absorb-1 #[514 "\301\302\303#\211\203- \304\305\306\307\310\311 \211\312\232\203 \313\202! \307\314\"\262$%\210\2025 \304\305\315$\210\210\316\317\320\321\322\323!\324\"\325\326%\"\207" [magit-this-process magit-get "branch" "pullRequest" magit-run-git-async "merge" "-m" format "Merge branch '%s'%s [%s]" magit-get-current-branch "master" "" " into %s" "--no-edit" set-process-sentinel make-byte-code 514 "\301!\302>\205- \303!\304V\203 \305\"\207\306\307\310#\210\305\"\210\311\300!\210\312\300!\210\313\314\315\300#\207" vconcat vector [process-status (exit signal) process-exit-status 0 magit-process-sentinel process-put inhibit-refresh t magit-branch-maybe-delete-pr-remote magit-branch-unset-pushRemote magit-run-git "branch" "-D"] 6 "\n\n(fn PROCESS EVENT)"] 14 (#$ . 7190)])
#@103 Squash commit REV into the current branch; don't create a commit.

(git merge --squash REV)

(fn REV)
(defalias 'magit-merge-squash #[257 "\300 \210\301\302\303#\207" [magit-merge-assert magit-run-git-async "merge" "--squash"] 5 (#$ . 8049) (byte-code "\300\301!C\207" [magit-read-other-branch-or-commit "Squash"] 2)])
#@66 Preview result of merging REV into the current branch.

(fn REV)
(defalias 'magit-merge-preview #[257 "\300!\207" [magit-merge-preview-setup-buffer] 3 (#$ . 8375) (byte-code "\300\301!C\207" [magit-read-other-branch-or-commit "Preview merge"] 2)])
#@57 Abort the current merge operation.

(git merge --abort)
(defalias 'magit-merge-abort #[0 "\300\301\302!!\204\f \303\304!\210\305\306!\210\307\310\311\"\207" [file-exists-p magit-git-dir "MERGE_HEAD" user-error "No merge in progress" magit-confirm abort-merge magit-run-git-async "merge" "--abort"] 3 (#$ . 8630) nil])
#@80 During a conflict checkout and stage side, or restore conflict.

(fn FILE ARG)
(defalias 'magit-checkout-stage #[514 "\211\300!@AAB\301:\203\342 @\211\302\232\203\202 A\211:\203w \211@\211\303=\203l A\211:\203a \211A\211\204; \304\305\306#\202\\ \307\232\203L \304\310\307\306\f$\202\\ \311\310	\306\f$\210\304\312\313\306\f$\262\202g \"\262\202r \"\262\202} \"\262\202\335 \211\314\232\203\331 A\211:\203\316 \211A\211:\203\303 \211@\211\303=\203\270 A\211\204\255 \304\305\306#\202\263 		\"\262\202\276 \"\262\202\311 \"\262\202\324 \"\262\202\335 \"\262\202\346 \211\"\207" [magit-file-status #[514 "\211\300\232\203 \301\302\300\303$\207\304\302\303$\210\301\305\306\303$\207" [#1="--merge" magit-run-git #2="checkout" "--" magit-call-git #3="add" #4="-u"] 7 "\n\n(fn FILE ARG)"] "--ours" 68 magit-run-git "rm" "--" #1# #2# magit-call-git #3# #4# "--theirs"] 14 (#$ . 8954) (byte-code "\300\301\302 \303\211\211\304\305 &\211\306 \235\203 \211\307!D\202- \310\311\312\"!\203* \211\313D\202- \314\315!\207" [magit-completing-read "Checkout file" magit-tracked-files nil magit-read-file-hist magit-current-file magit-unmerged-files magit-checkout-read-stage yes-or-no-p format "Restore conflicts in %s? " "--merge" user-error "Quit"] 8)])
(defalias 'magit-merge-in-progress-p #[0 "\300\301\302!!\207" [file-exists-p magit-git-dir "MERGE_HEAD"] 3])
#@23 

(fn &optional HEAD)
(defalias 'magit--merge-range #[256 "\211\204 \300\301\302\303!!@!\262\211\205 \304\305\306\307$\310Q\207" [magit-get-shortname magit-file-lines magit-git-dir "MERGE_HEAD" magit-git-string "merge-base" "--octopus" "HEAD" ".."] 6 (#$ . 10383)])
(defalias 'magit-merge-assert #[0 "\300\301!?\206 \302\303\304\"\207" [magit-anything-modified-p t magit-confirm merge-dirty "Merging with dirty worktree is risky.  Continue"] 3])
#@13 

(fn FILE)
(defalias 'magit-checkout-read-stage #[257 "\300\301\302\"\303P\304\"\211\305=\203 \306\202( \211\307=\203 \310\202( \211\311=\203' \312\202( \313\262\314\315!\210\207" [read-char-choice format "For %s checkout: " "[o]ur stage, [t]heir stage, [c]onflict, or [C-g] to abort " (111 116 99) 111 "--ours" 116 "--theirs" 99 "--merge" nil message ""] 5 (#$ . 10841)])
#@33 Keymap for `unmerged' sections.
(defvar magit-unmerged-section-map (byte-code "\300 \301\302\303#\210\211\207" [make-sparse-keymap define-key [remap magit-visit-thing] magit-diff-dwim] 5) (#$ . 11225))
#@121 Insert section for the on-going merge.
Display the heads that are being merged.
If no merge is in progress, do nothing.
(defalias 'magit-insert-merge-log #[0 "\306 \205n\307\310\311\312\313!!\"\314@!\315\316!\203 \211\202$ \211\236A\206$ \317\320\316!\203; \321\"@\206< \322\323\300#\202< \324\325\326 \327	&\330\331\332\333\"\211\203V \211\334=\202\210 \n\205a \335\336!\n\"\211\203l \337\331\"\202\206 \340\"\211\205\204 \341!\203\201 \211!\262\211\334=\262\262\262#\210\211\n\206\232 	?\205\232 \f\3422h\343\344\345\346\347\350#\"!\210\351@\352@\235\204\275 \352B\262\211\262\"\210\353\354!\210\355!\210\356\337\357\"\360\"\210\330\361\326 #\362\363\"\364\344\365\337\366\"\"!\364\344\367\337\366\"\"!\203\371 J\206\f\370!\203J\206\f\370!\205\f\211J\212\337\357\"b\210`W\203C\371`\317\"\206\"\372`\317\"\204<\373`\317\n$\210\203<\373`\363$\210\211b\266\202)\266\211\f=\203V\374A\375!)\202g\330\337\376\"\377\337\211\376\"\377\"C\244#0\210+\262\266\202\207" [magit--section-type-alist magit-insert-section--parent magit-insert-section--oldroot magit-section-initial-visibility-alist magit-root-section magit-insert-section--current magit-merge-in-progress-p mapcar magit-get-shortname magit-file-lines magit-git-dir "MERGE_HEAD" magit--merge-range unmerged class-p magit-section :type rassq error "BUG: No entry for %s in %s" :value :start point-marker :parent eieio-oset hidden run-hook-with-args-until-success magit-section-set-visibility-hook hide magit-get-section magit-section-ident eieio-oref magit-section-match-assoc functionp cancel-section magit-insert-heading format "Merging %s:" mapconcat identity ", " magit-insert-log "--decorate=full" run-hooks magit-insert-section-hook magit-insert-child-count set-marker-insertion-type start t end eieio-oref-default keymap intern "magit-%s-section-map" type "forge-%s-section-map" boundp next-single-property-change get-text-property put-text-property nil magit-section-show parent children magit-buffer-log-args magit-section-cache-visibility] 15 (#$ . 11435)])
(provide 'magit-merge)