	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	4, 0x90                         ## -- Begin function merge_one_change_manual
_merge_one_change_manual:               ## @merge_one_change_manual
	.cfi_startproc
## %bb.0:
	pushq	%rbp
	.cfi_def_cfa_offset 16
	.cfi_offset %rbp, -16
	movq	%rsp, %rbp
	.cfi_def_cfa_register %rbp
	pushq	%r15
	pushq	%r14
	pushq	%r13
	pushq	%r12
	pushq	%rbx
	subq	$56, %rsp
	.cfi_offset %rbx, -56
	.cfi_offset %r12, -48
	.cfi_offset %r13, -40
	.cfi_offset %r14, -32
	.cfi_offset %r15, -24
	movq	%rdx, -48(%rbp)                 ## 8-byte Spill
	movq	%rsi, %r14
	movq	%rdi, %r15
	movq	(%rdi), %rax
	movq	8(%rdi), %rcx
	testq	%rax, %rax
	leaq	L_.str(%rip), %rdx
	cmovneq	%rax, %rdx
	movq	%rdx, -64(%rbp)                 ## 8-byte Spill
	testq	%rcx, %rcx
	leaq	L_.str.1(%rip), %rax
	cmovneq	%rcx, %rax
	movq	%rax, -56(%rbp)                 ## 8-byte Spill
	movq	%rsi, %rdi
	callq	_oid_to_hex
	movq	%rax, %r13
	leaq	12(%r14), %rdi
	movq	%rdi, -72(%rbp)                 ## 8-byte Spill
	callq	_oid_to_hex
	movq	%rax, %r12
	leaq	8(%r14), %rdi
	movq	%rdi, -80(%rbp)                 ## 8-byte Spill
	callq	_oid_to_hex
	movq	%rax, %rbx
	leaq	4(%r14), %rdi
	movq	%rdi, -88(%rbp)                 ## 8-byte Spill
	callq	_oid_to_hex
	leaq	L_.str.2(%rip), %rdi
	movq	%r13, %rsi
	movq	%r12, %rdx
	movq	%rbx, %rcx
	movq	%rax, %r8
	xorl	%eax, %eax
	callq	_trace_printf
	cmpl	$0, 24(%r15)
	jne	LBB0_2
## %bb.1:
	leaq	20(%r15), %rdi
	leaq	L_.str.3(%rip), %rsi
	callq	_strbuf_addstr
LBB0_2:
	leaq	20(%r15), %rbx
	movq	%r14, %rdi
	callq	_oid_to_hex
	leaq	L_.str.4(%rip), %rsi
	movq	%rbx, %rdi
	movq	%rax, %rdx
	callq	_strbuf_addf
	cmpl	$2, 16(%r15)
	jl	LBB0_4
## %bb.3:
	movq	%r14, %rdi
	callq	_oid_to_hex
	leaq	L_.str.5(%rip), %rdi
	movq	%rax, %rsi
	xorl	%eax, %eax
	callq	_printf
LBB0_4:
	movq	%r15, %rdi
	callq	_check_notes_merge_worktree
	movq	-80(%rbp), %r13                 ## 8-byte Reload
	movq	%r13, %rdi
	callq	_is_null_oid
	movq	%rax, %rbx
	movq	-88(%rbp), %r12                 ## 8-byte Reload
	movq	%r12, %rdi
	callq	_is_null_oid
	testq	%rbx, %rbx
	je	LBB0_9
## %bb.5:
	xorl	%edi, %edi
	testq	%rax, %rax
	sete	%dil
	callq	_assert
	cmpl	$0, 16(%r15)
	jle	LBB0_7
## %bb.6:
	movq	%r14, %rdi
	callq	_oid_to_hex
	leaq	L_.str.6(%rip), %rdi
	movq	%rax, %rsi
	movq	-64(%rbp), %rdx                 ## 8-byte Reload
	movq	-56(%rbp), %rcx                 ## 8-byte Reload
	movq	%rcx, %r8
	xorl	%eax, %eax
	callq	_printf
LBB0_7:
	movq	%r14, %rdi
	movq	%r12, %rsi
	callq	_write_note_to_worktree
	jmp	LBB0_16
LBB0_9:
	testq	%rax, %rax
	je	LBB0_13
## %bb.10:
	movq	%r13, %rdi
	callq	_is_null_oid
	xorl	%edi, %edi
	testq	%rax, %rax
	sete	%dil
	callq	_assert
	cmpl	$0, 16(%r15)
	jle	LBB0_12
## %bb.11:
	movq	%r14, %rdi
	callq	_oid_to_hex
	leaq	L_.str.6(%rip), %rdi
	movq	%rax, %rsi
	movq	-56(%rbp), %rdx                 ## 8-byte Reload
	movq	-64(%rbp), %rcx                 ## 8-byte Reload
	movq	%rcx, %r8
	xorl	%eax, %eax
	callq	_printf
LBB0_12:
	movq	%r14, %rdi
	movq	%r13, %rsi
	callq	_write_note_to_worktree
	jmp	LBB0_16
LBB0_13:
	movq	-72(%rbp), %rdi                 ## 8-byte Reload
	callq	_is_null_oid
	movq	%r13, %rdi
	movq	%rax, %r13
	callq	_is_null_oid
	xorl	%edi, %edi
	testq	%rax, %rax
	sete	%dil
	callq	_assert
	movq	%r12, %rdi
	callq	_is_null_oid
	xorl	%edi, %edi
	testq	%rax, %rax
	sete	%dil
	callq	_assert
	cmpl	$0, 16(%r15)
	jle	LBB0_15
## %bb.14:
	testq	%r13, %r13
	leaq	L_.str.7(%rip), %rax
	leaq	L_.str.8(%rip), %rbx
	cmoveq	%rax, %rbx
	movq	%r14, %rdi
	callq	_oid_to_hex
	leaq	L_.str.9(%rip), %rdi
	movq	%rbx, %rsi
	movq	%rax, %rdx
	xorl	%eax, %eax
	callq	_printf
LBB0_15:
	movq	%r15, %rdi
	movq	%r14, %rsi
	callq	_ll_merge_in_worktree
LBB0_16:
	movq	-48(%rbp), %rbx                 ## 8-byte Reload
	leaq	L_.str.10(%rip), %rdi
	xorl	%eax, %eax
	callq	_trace_printf
	movl	(%r14), %esi
	movq	%rbx, %rdi
	callq	_remove_note
	movl	$1, %eax
	addq	$56, %rsp
	popq	%rbx
	popq	%r12
	popq	%r13
	popq	%r14
	popq	%r15
	popq	%rbp
	retq
	.cfi_endproc
                                        ## -- End function
	.section	__TEXT,__cstring,cstring_literals
L_.str:                                 ## @.str
	.asciz	"local version"

L_.str.1:                               ## @.str.1
	.asciz	"remote version"

L_.str.2:                               ## @.str.2
	.asciz	"\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, local = %.7s, remote = %.7s)\n"

L_.str.3:                               ## @.str.3
	.asciz	"\n\nConflicts:\n"

L_.str.4:                               ## @.str.4
	.asciz	"\t%s\n"

L_.str.5:                               ## @.str.5
	.asciz	"Auto-merging notes for %s\n"

L_.str.6:                               ## @.str.6
	.asciz	"CONFLICT (delete/modify): Notes for object %s deleted in %s and modified in %s. Version from %s left in tree.\n"

L_.str.7:                               ## @.str.7
	.asciz	"content"

L_.str.8:                               ## @.str.8
	.asciz	"add/add"

L_.str.9:                               ## @.str.9
	.asciz	"CONFLICT (%s): Merge conflict in notes for object %s\n"

L_.str.10:                              ## @.str.10
	.asciz	"\t\t\tremoving from partial merge result\n"

	.no_dead_strip	_merge_one_change_manual
.subsections_via_symbols

	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	2                               ; -- Begin function merge_one_change_manual
_merge_one_change_manual:               ; @merge_one_change_manual
	.cfi_startproc
; %bb.0:
	sub	sp, sp, #144
	.cfi_def_cfa_offset 144
	stp	x28, x27, [sp, #48]             ; 16-byte Folded Spill
	stp	x26, x25, [sp, #64]             ; 16-byte Folded Spill
	stp	x24, x23, [sp, #80]             ; 16-byte Folded Spill
	stp	x22, x21, [sp, #96]             ; 16-byte Folded Spill
	stp	x20, x19, [sp, #112]            ; 16-byte Folded Spill
	stp	x29, x30, [sp, #128]            ; 16-byte Folded Spill
	add	x29, sp, #128
	.cfi_def_cfa w29, 16
	.cfi_offset w30, -8
	.cfi_offset w29, -16
	.cfi_offset w19, -24
	.cfi_offset w20, -32
	.cfi_offset w21, -40
	.cfi_offset w22, -48
	.cfi_offset w23, -56
	.cfi_offset w24, -64
	.cfi_offset w25, -72
	.cfi_offset w26, -80
	.cfi_offset w27, -88
	.cfi_offset w28, -96
	str	x2, [sp, #40]                   ; 8-byte Folded Spill
	mov	x20, x1
	mov	x21, x0
Lloh0:
	adrp	x8, l_.str@PAGE
Lloh1:
	add	x8, x8, l_.str@PAGEOFF
	ldp	x9, x10, [x0]
	cmp	x9, #0
	csel	x28, x8, x9, eq
Lloh2:
	adrp	x8, l_.str.1@PAGE
Lloh3:
	add	x8, x8, l_.str.1@PAGEOFF
	cmp	x10, #0
	csel	x19, x8, x10, eq
	mov	x0, x1
	bl	_oid_to_hex
	mov	x25, x0
	add	x24, x20, #12
	mov	x0, x24
	bl	_oid_to_hex
	mov	x26, x0
	add	x22, x20, #8
	mov	x0, x22
	bl	_oid_to_hex
	mov	x27, x0
	add	x23, x20, #4
	mov	x0, x23
	bl	_oid_to_hex
	stp	x27, x0, [sp, #16]
	stp	x25, x26, [sp]
Lloh4:
	adrp	x0, l_.str.2@PAGE
Lloh5:
	add	x0, x0, l_.str.2@PAGEOFF
	bl	_trace_printf
	ldr	w8, [x21, #24]
	cbnz	w8, LBB0_2
; %bb.1:
	add	x0, x21, #20
Lloh6:
	adrp	x1, l_.str.3@PAGE
Lloh7:
	add	x1, x1, l_.str.3@PAGEOFF
	bl	_strbuf_addstr
LBB0_2:
	add	x25, x21, #20
	mov	x0, x20
	bl	_oid_to_hex
	mov	x2, x0
Lloh8:
	adrp	x1, l_.str.4@PAGE
Lloh9:
	add	x1, x1, l_.str.4@PAGEOFF
	mov	x0, x25
	bl	_strbuf_addf
	ldr	w8, [x21, #16]
	cmp	w8, #2
	b.lt	LBB0_4
; %bb.3:
	mov	x0, x20
	bl	_oid_to_hex
	mov	x1, x0
Lloh10:
	adrp	x0, l_.str.5@PAGE
Lloh11:
	add	x0, x0, l_.str.5@PAGEOFF
	bl	_printf
LBB0_4:
	mov	x0, x21
	bl	_check_notes_merge_worktree
	mov	x0, x22
	bl	_is_null_oid
	mov	x25, x0
	mov	x0, x23
	bl	_is_null_oid
	cbz	x25, LBB0_8
; %bb.5:
	cmp	x0, #0
	cset	w0, eq
	bl	_assert
	ldr	w8, [x21, #16]
	cmp	w8, #1
	b.lt	LBB0_7
; %bb.6:
	mov	x0, x20
	bl	_oid_to_hex
	mov	x1, x0
	stp	x19, x19, [sp, #8]
	str	x28, [sp]
Lloh12:
	adrp	x0, l_.str.6@PAGE
Lloh13:
	add	x0, x0, l_.str.6@PAGEOFF
	bl	_printf
LBB0_7:
	mov	x0, x20
	mov	x1, x23
	b	LBB0_12
LBB0_8:
	cbz	x0, LBB0_14
; %bb.9:
	mov	x0, x22
	bl	_is_null_oid
	cmp	x0, #0
	cset	w0, eq
	bl	_assert
	ldr	w8, [x21, #16]
	cmp	w8, #1
	b.lt	LBB0_11
; %bb.10:
	mov	x0, x20
	bl	_oid_to_hex
	mov	x1, x0
	stp	x28, x28, [sp, #8]
	str	x19, [sp]
Lloh14:
	adrp	x0, l_.str.6@PAGE
Lloh15:
	add	x0, x0, l_.str.6@PAGEOFF
	bl	_printf
LBB0_11:
	mov	x0, x20
	mov	x1, x22
LBB0_12:
	bl	_write_note_to_worktree
	ldr	x19, [sp, #40]                  ; 8-byte Folded Reload
LBB0_13:
Lloh16:
	adrp	x0, l_.str.10@PAGE
Lloh17:
	add	x0, x0, l_.str.10@PAGEOFF
	bl	_trace_printf
	ldr	w1, [x20]
	mov	x0, x19
	bl	_remove_note
	mov	w0, #1
	ldp	x29, x30, [sp, #128]            ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #112]            ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #96]             ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #80]             ; 16-byte Folded Reload
	ldp	x26, x25, [sp, #64]             ; 16-byte Folded Reload
	ldp	x28, x27, [sp, #48]             ; 16-byte Folded Reload
	add	sp, sp, #144
	ret
LBB0_14:
	mov	x0, x24
	bl	_is_null_oid
	mov	x24, x0
	mov	x0, x22
	bl	_is_null_oid
	cmp	x0, #0
	cset	w0, eq
	bl	_assert
	mov	x0, x23
	bl	_is_null_oid
	cmp	x0, #0
	cset	w0, eq
	bl	_assert
	ldr	w8, [x21, #16]
	cmp	w8, #1
	ldr	x19, [sp, #40]                  ; 8-byte Folded Reload
	b.lt	LBB0_16
; %bb.15:
Lloh18:
	adrp	x8, l_.str.8@PAGE
Lloh19:
	add	x8, x8, l_.str.8@PAGEOFF
Lloh20:
	adrp	x9, l_.str.7@PAGE
Lloh21:
	add	x9, x9, l_.str.7@PAGEOFF
	cmp	x24, #0
	csel	x22, x9, x8, eq
	mov	x0, x20
	bl	_oid_to_hex
	str	x0, [sp]
Lloh22:
	adrp	x0, l_.str.9@PAGE
Lloh23:
	add	x0, x0, l_.str.9@PAGEOFF
	mov	x1, x22
	bl	_printf
LBB0_16:
	mov	x0, x21
	mov	x1, x20
	bl	_ll_merge_in_worktree
	b	LBB0_13
	.loh AdrpAdd	Lloh4, Lloh5
	.loh AdrpAdd	Lloh2, Lloh3
	.loh AdrpAdd	Lloh0, Lloh1
	.loh AdrpAdd	Lloh6, Lloh7
	.loh AdrpAdd	Lloh8, Lloh9
	.loh AdrpAdd	Lloh10, Lloh11
	.loh AdrpAdd	Lloh12, Lloh13
	.loh AdrpAdd	Lloh14, Lloh15
	.loh AdrpAdd	Lloh16, Lloh17
	.loh AdrpAdd	Lloh22, Lloh23
	.loh AdrpAdd	Lloh20, Lloh21
	.loh AdrpAdd	Lloh18, Lloh19
	.cfi_endproc
                                        ; -- End function
	.section	__TEXT,__cstring,cstring_literals
l_.str:                                 ; @.str
	.asciz	"local version"

l_.str.1:                               ; @.str.1
	.asciz	"remote version"

l_.str.2:                               ; @.str.2
	.asciz	"\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, local = %.7s, remote = %.7s)\n"

l_.str.3:                               ; @.str.3
	.asciz	"\n\nConflicts:\n"

l_.str.4:                               ; @.str.4
	.asciz	"\t%s\n"

l_.str.5:                               ; @.str.5
	.asciz	"Auto-merging notes for %s\n"

l_.str.6:                               ; @.str.6
	.asciz	"CONFLICT (delete/modify): Notes for object %s deleted in %s and modified in %s. Version from %s left in tree.\n"

l_.str.7:                               ; @.str.7
	.asciz	"content"

l_.str.8:                               ; @.str.8
	.asciz	"add/add"

l_.str.9:                               ; @.str.9
	.asciz	"CONFLICT (%s): Merge conflict in notes for object %s\n"

l_.str.10:                              ; @.str.10
	.asciz	"\t\t\tremoving from partial merge result\n"

	.no_dead_strip	_merge_one_change_manual
.subsections_via_symbols
