	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	4, 0x90                         ## -- Begin function resolve_merge_incoming_added_dir_merge
_resolve_merge_incoming_added_dir_merge: ## @resolve_merge_incoming_added_dir_merge
	.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	$120, %rsp
	.cfi_offset %rbx, -56
	.cfi_offset %r12, -48
	.cfi_offset %r13, -40
	.cfi_offset %r14, -32
	.cfi_offset %r15, -24
	movq	%rcx, %r14
	movq	%rdx, -136(%rbp)                ## 8-byte Spill
	movq	%rsi, %r12
	movq	%rdi, %r13
	movq	%rsi, %rdi
	callq	_svn_client_conflict_get_local_abspath
	movq	%rax, %rbx
	movq	8(%r12), %r15
	testq	%r15, %r15
	je	LBB0_15
## %bb.1:
	movq	%r13, -128(%rbp)                ## 8-byte Spill
	movq	%rbx, -48(%rbp)                 ## 8-byte Spill
	leaq	-64(%rbp), %rdi
	xorl	%esi, %esi
	movq	%r12, %rdx
	movq	%r14, %rcx
	movq	%r14, %r8
	callq	_svn_client_conflict_get_repos_info
	movq	%rax, %rdi
	callq	_SVN_ERR
	movq	-64(%rbp), %rdi
	movq	(%r15), %rsi
	movq	%r14, %rdx
	callq	_svn_path_url_add_component2
	movq	%rax, %rbx
	leaq	-152(%rbp), %rdi
	leaq	-56(%rbp), %rsi
	xorl	%edx, %edx
	movq	%r12, %rcx
	movq	%r14, %r8
	movq	%r14, %r9
	callq	_svn_client_conflict_get_incoming_old_repos_location
	movq	%rax, %rdi
	callq	_SVN_ERR
	leaq	-104(%rbp), %rdi
	leaq	-96(%rbp), %r13
	movq	%r13, %rsi
	xorl	%edx, %edx
	movq	%r12, %rcx
	movq	%r14, %r8
	movq	%r14, %r9
	callq	_svn_client_conflict_get_incoming_new_repos_location
	movq	%rax, %rdi
	callq	_SVN_ERR
	movq	-56(%rbp), %rax
	cmpq	-96(%rbp), %rax
	jge	LBB0_6
## %bb.2:
	movq	8(%r15), %rdi
	movq	_SVN_INVALID_REVNUM@GOTPCREL(%rip), %rax
	cmpq	(%rax), %rdi
	jne	LBB0_5
## %bb.3:
	movq	_SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str.1(%rip), %rdi
	jmp	LBB0_4
LBB0_15:
	movq	_SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str(%rip), %rdi
	callq	__
	movl	%eax, %r12d
	movl	(%r13), %r13d
	movq	%rbx, %rdi
	movq	%r14, %rsi
	callq	_svn_dirent_local_style
	movl	%r15d, %edi
	xorl	%esi, %esi
	movl	%r12d, %edx
	movl	%r13d, %ecx
	movl	%eax, %r8d
	xorl	%eax, %eax
	addq	$120, %rsp
	popq	%rbx
	popq	%r12
	popq	%r13
	popq	%r14
	popq	%r15
	popq	%rbp
	jmp	_svn_error_createf              ## TAILCALL
LBB0_6:
	movq	16(%r15), %rcx
	movq	_SVN_INVALID_REVNUM@GOTPCREL(%rip), %rax
	cmpq	(%rax), %rcx
	jne	LBB0_8
## %bb.7:
	movq	_SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str.2(%rip), %rdi
LBB0_4:
	callq	__
	movl	%eax, %r12d
	movq	-48(%rbp), %rdi                 ## 8-byte Reload
	movq	%r14, %rsi
	callq	_svn_dirent_local_style
	movl	%r15d, %edi
	xorl	%esi, %esi
	movl	%r12d, %edx
	movl	%eax, %ecx
	xorl	%eax, %eax
	callq	_svn_error_createf
	jmp	LBB0_14
LBB0_5:
	movq	%rbx, -88(%rbp)                 ## 8-byte Spill
	callq	_rev_below
	movq	%rax, -80(%rbp)                 ## 8-byte Spill
	movq	-64(%rbp), %rdi
	movq	-104(%rbp), %rsi
	movq	%r14, %rdx
	callq	_svn_path_url_add_component2
	movq	%rax, -72(%rbp)                 ## 8-byte Spill
	jmp	LBB0_9
LBB0_8:
	movq	%rbx, -88(%rbp)                 ## 8-byte Spill
	movq	-64(%rbp), %rdi
	movq	-152(%rbp), %rsi
	movq	%rcx, -80(%rbp)                 ## 8-byte Spill
	movq	%r14, %rdx
	callq	_svn_path_url_add_component2
	movq	%rax, -72(%rbp)                 ## 8-byte Spill
	leaq	-56(%rbp), %r13
LBB0_9:
	movq	(%r13), %rax
	movq	%rax, -120(%rbp)                ## 8-byte Spill
	movq	-104(%rbp), %rax
	movq	%rax, -112(%rbp)                ## 8-byte Spill
	movq	-136(%rbp), %r15                ## 8-byte Reload
	movl	16(%r15), %esi
	leaq	-144(%rbp), %rdi
	movq	-48(%rbp), %r13                 ## 8-byte Reload
	movq	%r13, %rdx
	movq	%r14, %rcx
	movq	%r14, %r8
	callq	_svn_wc__acquire_write_lock_for_resolve
	movq	%rax, %rdi
	callq	_SVN_ERR
	movq	-56(%rbp), %rax
	xorl	%ebx, %ebx
	cmpq	-96(%rbp), %rax
	setg	%bl
	movq	-112(%rbp), %rdi                ## 8-byte Reload
	movq	-88(%rbp), %rsi                 ## 8-byte Reload
	movq	-80(%rbp), %rdx                 ## 8-byte Reload
	movq	-72(%rbp), %rcx                 ## 8-byte Reload
	movq	-120(%rbp), %r8                 ## 8-byte Reload
	movq	%r13, %r9
	pushq	%r14
	pushq	%r14
	movq	%r15, %r13
	pushq	%r15
	pushq	%rbx
	callq	_merge_newly_added_dir
	addq	$32, %rsp
	movq	%rax, %r15
	testq	%rax, %rax
	jne	LBB0_11
## %bb.10:
	movl	16(%r13), %edi
	movq	-48(%rbp), %rsi                 ## 8-byte Reload
	movq	%r14, %rdx
	callq	_svn_wc__del_tree_conflict
	movq	%rax, %r15
LBB0_11:
	movl	16(%r13), %edi
	movq	-144(%rbp), %rsi
	movq	%r14, %rdx
	callq	_svn_wc__release_write_lock
	movq	%r15, %rdi
	movl	%eax, %esi
	callq	_svn_error_compose_create
	movq	%rax, %rbx
	movq	-48(%rbp), %rdi                 ## 8-byte Reload
	movq	%r14, %rsi
	callq	_svn_io_sleep_for_timestamps
	movq	%rbx, %rdi
	callq	_SVN_ERR
	movq	8(%r13), %rbx
	testq	%rbx, %rbx
	je	LBB0_13
## %bb.12:
	movl	(%r13), %r15d
	movq	_svn_wc_notify_resolved_tree@GOTPCREL(%rip), %rax
	movl	(%rax), %esi
	movq	-48(%rbp), %rdi                 ## 8-byte Reload
	movq	%r14, %rdx
	callq	_svn_wc_create_notify
	movl	%r15d, %edi
	movl	%eax, %esi
	movq	%r14, %rdx
	callq	*%rbx
LBB0_13:
	movq	-128(%rbp), %rdi                ## 8-byte Reload
	callq	_svn_client_conflict_option_get_id
	movl	%eax, (%r12)
	movq	_SVN_NO_ERROR@GOTPCREL(%rip), %rax
	movq	(%rax), %rax
LBB0_14:
	addq	$120, %rsp
	popq	%rbx
	popq	%r12
	popq	%r13
	popq	%r14
	popq	%r15
	popq	%rbp
	retq
	.cfi_endproc
                                        ## -- End function
	.comm	_SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,4,2 ## @SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE
	.section	__TEXT,__cstring,cstring_literals
L_.str:                                 ## @.str
	.asciz	"Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository"

	.comm	_SVN_INVALID_REVNUM,8,3         ## @SVN_INVALID_REVNUM
L_.str.1:                               ## @.str.1
	.asciz	"Could not determine when '%s' was added the repository"

L_.str.2:                               ## @.str.2
	.asciz	"Could not determine when '%s' was deleted from the repository"

	.comm	_svn_wc_notify_resolved_tree,4,2 ## @svn_wc_notify_resolved_tree
	.comm	_SVN_NO_ERROR,8,3               ## @SVN_NO_ERROR
	.no_dead_strip	_resolve_merge_incoming_added_dir_merge
.subsections_via_symbols

	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	2                               ; -- Begin function resolve_merge_incoming_added_dir_merge
_resolve_merge_incoming_added_dir_merge: ; @resolve_merge_incoming_added_dir_merge
	.cfi_startproc
; %bb.0:
	sub	sp, sp, #160
	.cfi_def_cfa_offset 160
	stp	x28, x27, [sp, #64]             ; 16-byte Folded Spill
	stp	x26, x25, [sp, #80]             ; 16-byte Folded Spill
	stp	x24, x23, [sp, #96]             ; 16-byte Folded Spill
	stp	x22, x21, [sp, #112]            ; 16-byte Folded Spill
	stp	x20, x19, [sp, #128]            ; 16-byte Folded Spill
	stp	x29, x30, [sp, #144]            ; 16-byte Folded Spill
	add	x29, sp, #144
	.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
	mov	x19, x3
	mov	x23, x2
	mov	x22, x1
	mov	x21, x0
	mov	x0, x1
	bl	_svn_client_conflict_get_local_abspath
	mov	x20, x0
	ldr	x25, [x22, #8]
	cbz	x25, LBB0_4
; %bb.1:
	add	x0, sp, #56
	mov	x1, #0
	mov	x2, x22
	mov	x3, x19
	mov	x4, x19
	bl	_svn_client_conflict_get_repos_info
	bl	_SVN_ERR
	ldr	x0, [sp, #56]
	ldr	x1, [x25]
	mov	x2, x19
	bl	_svn_path_url_add_component2
	mov	x24, x0
	add	x0, sp, #48
	add	x1, sp, #40
	mov	x2, #0
	mov	x3, x22
	mov	x4, x19
	mov	x5, x19
	bl	_svn_client_conflict_get_incoming_old_repos_location
	bl	_SVN_ERR
	add	x0, sp, #32
	add	x1, sp, #24
	mov	x2, #0
	mov	x3, x22
	mov	x4, x19
	mov	x5, x19
	bl	_svn_client_conflict_get_incoming_new_repos_location
	bl	_SVN_ERR
	ldr	x8, [sp, #40]
	ldr	x9, [sp, #24]
	cmp	x8, x9
	b.ge	LBB0_5
; %bb.2:
	ldr	x0, [x25, #8]
Lloh0:
	adrp	x8, _SVN_INVALID_REVNUM@GOTPAGE
Lloh1:
	ldr	x8, [x8, _SVN_INVALID_REVNUM@GOTPAGEOFF]
Lloh2:
	ldr	x8, [x8]
	cmp	x0, x8
	b.ne	LBB0_8
; %bb.3:
Lloh3:
	adrp	x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGE
Lloh4:
	ldr	x8, [x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGEOFF]
Lloh5:
	ldr	w21, [x8]
Lloh6:
	adrp	x0, l_.str.1@PAGE
Lloh7:
	add	x0, x0, l_.str.1@PAGEOFF
	b	LBB0_7
LBB0_4:
Lloh8:
	adrp	x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGE
Lloh9:
	ldr	x8, [x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGEOFF]
Lloh10:
	ldr	w22, [x8]
Lloh11:
	adrp	x0, l_.str@PAGE
Lloh12:
	add	x0, x0, l_.str@PAGEOFF
	bl	__
	mov	x23, x0
	ldr	w21, [x21]
	mov	x0, x20
	mov	x1, x19
	bl	_svn_dirent_local_style
                                        ; kill: def $w0 killed $w0 def $x0
	str	x0, [sp]
	mov	x0, x22
	mov	x1, #0
	mov	x2, x23
	mov	x3, x21
	bl	_svn_error_createf
	b	LBB0_15
LBB0_5:
	ldr	x25, [x25, #16]
Lloh13:
	adrp	x8, _SVN_INVALID_REVNUM@GOTPAGE
Lloh14:
	ldr	x8, [x8, _SVN_INVALID_REVNUM@GOTPAGEOFF]
Lloh15:
	ldr	x8, [x8]
	cmp	x25, x8
	b.ne	LBB0_9
; %bb.6:
Lloh16:
	adrp	x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGE
Lloh17:
	ldr	x8, [x8, _SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE@GOTPAGEOFF]
Lloh18:
	ldr	w21, [x8]
Lloh19:
	adrp	x0, l_.str.2@PAGE
Lloh20:
	add	x0, x0, l_.str.2@PAGEOFF
LBB0_7:
	bl	__
	mov	x22, x0
	mov	x0, x20
	mov	x1, x19
	bl	_svn_dirent_local_style
	mov	x3, x0
	mov	x0, x21
	mov	x1, #0
	mov	x2, x22
	bl	_svn_error_createf
	b	LBB0_15
LBB0_8:
	bl	_rev_below
	mov	x25, x0
	ldr	x0, [sp, #56]
	ldr	x1, [sp, #32]
	mov	x2, x19
	bl	_svn_path_url_add_component2
	mov	x26, x0
	add	x8, sp, #24
	b	LBB0_10
LBB0_9:
	ldp	x1, x0, [sp, #48]
	mov	x2, x19
	bl	_svn_path_url_add_component2
	mov	x26, x0
	add	x8, sp, #40
LBB0_10:
	ldr	x27, [x8]
	ldr	x28, [sp, #32]
	ldr	w1, [x23, #16]
	add	x0, sp, #16
	mov	x2, x20
	mov	x3, x19
	mov	x4, x19
	bl	_svn_wc__acquire_write_lock_for_resolve
	bl	_SVN_ERR
	ldr	x8, [sp, #40]
	ldr	x9, [sp, #24]
	cmp	x8, x9
	cset	w6, gt
	stp	x19, x19, [sp]
	mov	x0, x28
	mov	x1, x24
	mov	x2, x25
	mov	x3, x26
	mov	x4, x27
	mov	x5, x20
	mov	x7, x23
	bl	_merge_newly_added_dir
	mov	x24, x0
	cbnz	x0, LBB0_12
; %bb.11:
	ldr	w0, [x23, #16]
	mov	x1, x20
	mov	x2, x19
	bl	_svn_wc__del_tree_conflict
	mov	x24, x0
LBB0_12:
	ldr	w0, [x23, #16]
	ldr	x1, [sp, #16]
	mov	x2, x19
	bl	_svn_wc__release_write_lock
	mov	x1, x0
	mov	x0, x24
	bl	_svn_error_compose_create
	mov	x24, x0
	mov	x0, x20
	mov	x1, x19
	bl	_svn_io_sleep_for_timestamps
	mov	x0, x24
	bl	_SVN_ERR
	ldr	x24, [x23, #8]
	cbz	x24, LBB0_14
; %bb.13:
	ldr	w23, [x23]
Lloh21:
	adrp	x8, _svn_wc_notify_resolved_tree@GOTPAGE
Lloh22:
	ldr	x8, [x8, _svn_wc_notify_resolved_tree@GOTPAGEOFF]
Lloh23:
	ldr	w1, [x8]
	mov	x0, x20
	mov	x2, x19
	bl	_svn_wc_create_notify
	mov	x1, x0
	mov	x0, x23
	mov	x2, x19
	blr	x24
LBB0_14:
	mov	x0, x21
	bl	_svn_client_conflict_option_get_id
	str	w0, [x22]
Lloh24:
	adrp	x8, _SVN_NO_ERROR@GOTPAGE
Lloh25:
	ldr	x8, [x8, _SVN_NO_ERROR@GOTPAGEOFF]
Lloh26:
	ldr	x0, [x8]
LBB0_15:
	ldp	x29, x30, [sp, #144]            ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #128]            ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #112]            ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #96]             ; 16-byte Folded Reload
	ldp	x26, x25, [sp, #80]             ; 16-byte Folded Reload
	ldp	x28, x27, [sp, #64]             ; 16-byte Folded Reload
	add	sp, sp, #160
	ret
	.loh AdrpLdrGotLdr	Lloh0, Lloh1, Lloh2
	.loh AdrpAdd	Lloh6, Lloh7
	.loh AdrpLdrGotLdr	Lloh3, Lloh4, Lloh5
	.loh AdrpAdd	Lloh11, Lloh12
	.loh AdrpLdrGotLdr	Lloh8, Lloh9, Lloh10
	.loh AdrpLdrGotLdr	Lloh13, Lloh14, Lloh15
	.loh AdrpAdd	Lloh19, Lloh20
	.loh AdrpLdrGotLdr	Lloh16, Lloh17, Lloh18
	.loh AdrpLdrGotLdr	Lloh21, Lloh22, Lloh23
	.loh AdrpLdrGotLdr	Lloh24, Lloh25, Lloh26
	.cfi_endproc
                                        ; -- End function
	.comm	_SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,4,2 ; @SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE
	.section	__TEXT,__cstring,cstring_literals
l_.str:                                 ; @.str
	.asciz	"Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository"

	.comm	_SVN_INVALID_REVNUM,8,3         ; @SVN_INVALID_REVNUM
l_.str.1:                               ; @.str.1
	.asciz	"Could not determine when '%s' was added the repository"

l_.str.2:                               ; @.str.2
	.asciz	"Could not determine when '%s' was deleted from the repository"

	.comm	_svn_wc_notify_resolved_tree,4,2 ; @svn_wc_notify_resolved_tree
	.comm	_SVN_NO_ERROR,8,3               ; @SVN_NO_ERROR
	.no_dead_strip	_resolve_merge_incoming_added_dir_merge
.subsections_via_symbols
