	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	4, 0x90                         ## -- Begin function conflict_tree_get_description_incoming_edit
_conflict_tree_get_description_incoming_edit: ## @conflict_tree_get_description_incoming_edit
	.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	%r8, %r13
	movq	%rcx, %r15
	movq	%rsi, %rbx
	movq	%rdi, %r14
	cmpq	$0, (%rsi)
	je	LBB0_42
## %bb.1:
	leaq	-88(%rbp), %rdi
	leaq	-64(%rbp), %rsi
	leaq	-80(%rbp), %rdx
	movq	%rbx, %rcx
	movq	%r13, %r8
	movq	%r13, %r9
	callq	_svn_client_conflict_get_incoming_old_repos_location
	movl	%eax, %edi
	callq	_SVN_ERR
	leaq	-48(%rbp), %rdi
	leaq	-56(%rbp), %rsi
	leaq	-72(%rbp), %rdx
	movq	%rbx, %rcx
	movq	%r13, %r8
	movq	%r13, %r9
	callq	_svn_client_conflict_get_incoming_new_repos_location
	movl	%eax, %edi
	callq	_SVN_ERR
	movq	%rbx, %rdi
	callq	_svn_client_conflict_get_operation
	movq	(%rbx), %r12
	movq	_svn_wc_operation_update@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	jne	LBB0_3
## %bb.2:
	movq	-64(%rbp), %rdi
	movq	-56(%rbp), %rsi
	movq	-80(%rbp), %rdx
	movq	-72(%rbp), %rcx
	movq	%r13, %r8
	callq	_describe_incoming_edit_upon_update
	jmp	LBB0_39
LBB0_42:
	movq	%r14, %rdi
	movq	%rbx, %rsi
	movq	%r15, %rcx
	movq	%r13, %r8
	callq	_conflict_tree_get_incoming_description_generic
	movl	%eax, %edi
	addq	$56, %rsp
	popq	%rbx
	popq	%r12
	popq	%r13
	popq	%r14
	popq	%r15
	popq	%rbp
	jmp	_svn_error_trace                ## TAILCALL
LBB0_3:
	movq	_svn_wc_operation_switch@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	jne	LBB0_5
## %bb.4:
	movq	-48(%rbp), %rdi
	movq	-56(%rbp), %rsi
	movq	-72(%rbp), %rdx
	movq	%r13, %rcx
	callq	_describe_incoming_edit_upon_switch
	jmp	LBB0_39
LBB0_5:
	movq	_svn_wc_operation_merge@GOTPCREL(%rip), %rcx
                                        ## implicit-def: $rbx
	cmpq	(%rcx), %rax
	jne	LBB0_40
## %bb.6:
	movq	-64(%rbp), %rcx
	movq	-56(%rbp), %rdx
	cmpq	%rdx, %rcx
	jge	LBB0_23
## %bb.7:
	incq	%rcx
	movq	-72(%rbp), %rax
	movq	_svn_node_dir@GOTPCREL(%rip), %rsi
	movq	(%rsi), %rsi
	cmpq	%rdx, %rcx
	jne	LBB0_16
## %bb.8:
	cmpq	%rsi, %rax
	jne	LBB0_10
## %bb.9:
	leaq	L_.str(%rip), %rdi
	jmp	LBB0_14
LBB0_23:
	incq	%rdx
	movq	-72(%rbp), %rax
	movq	_svn_node_dir@GOTPCREL(%rip), %rsi
	movq	(%rsi), %rsi
	cmpq	%rcx, %rdx
	jne	LBB0_31
## %bb.24:
	cmpq	%rsi, %rax
	jne	LBB0_26
## %bb.25:
	leaq	L_.str.6(%rip), %rdi
	jmp	LBB0_30
LBB0_16:
	cmpq	%rsi, %rax
	jne	LBB0_19
## %bb.17:
	leaq	L_.str.3(%rip), %rdi
	jmp	LBB0_18
LBB0_31:
	cmpq	%rsi, %rax
	jne	LBB0_33
## %bb.32:
	leaq	L_.str.9(%rip), %rdi
	jmp	LBB0_37
LBB0_10:
	movq	_svn_node_file@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_12
## %bb.11:
	movq	_svn_node_symlink@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_12
## %bb.13:
	leaq	L_.str.2(%rip), %rdi
	jmp	LBB0_14
LBB0_26:
	movq	_svn_node_file@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_28
## %bb.27:
	movq	_svn_node_symlink@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_28
## %bb.29:
	leaq	L_.str.8(%rip), %rdi
	jmp	LBB0_30
LBB0_19:
	movq	_svn_node_file@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_21
## %bb.20:
	movq	_svn_node_symlink@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_21
## %bb.22:
	leaq	L_.str.5(%rip), %rdi
	jmp	LBB0_18
LBB0_33:
	movq	_svn_node_file@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_35
## %bb.34:
	movq	_svn_node_symlink@GOTPCREL(%rip), %rcx
	cmpq	(%rcx), %rax
	je	LBB0_35
## %bb.36:
	leaq	L_.str.11(%rip), %rdi
	jmp	LBB0_37
LBB0_12:
	leaq	L_.str.1(%rip), %rdi
LBB0_14:
	callq	__
	movq	-48(%rbp), %rdx
	movq	-56(%rbp), %rcx
	jmp	LBB0_15
LBB0_28:
	leaq	L_.str.7(%rip), %rdi
LBB0_30:
	callq	__
	movq	-48(%rbp), %rdx
	movq	-64(%rbp), %rcx
LBB0_15:
	movq	%r13, %rdi
	movq	%rax, %rsi
	jmp	LBB0_41
LBB0_21:
	leaq	L_.str.4(%rip), %rdi
LBB0_18:
	callq	__
	movq	-48(%rbp), %rdx
	movq	-64(%rbp), %rcx
	incq	%rcx
	movq	-56(%rbp), %r8
	jmp	LBB0_38
LBB0_35:
	leaq	L_.str.10(%rip), %rdi
LBB0_37:
	callq	__
	movq	-48(%rbp), %rdx
	movq	-56(%rbp), %rcx
	incq	%rcx
	movq	-64(%rbp), %r8
LBB0_38:
	movq	%r13, %rdi
	movq	%rax, %rsi
	xorl	%eax, %eax
	callq	_apr_psprintf
LBB0_39:
	movq	%rax, %rbx
LBB0_40:
	movq	%r12, %rdi
	movq	%r13, %rsi
	callq	_describe_incoming_edit_list_modified_revs
	leaq	L_.str.12(%rip), %rsi
	movq	%r13, %rdi
	movq	%rbx, %rdx
	movq	%rax, %rcx
LBB0_41:
	xorl	%eax, %eax
	callq	_apr_psprintf
	movq	%r15, %rdi
	movq	%rax, %rsi
	callq	_apr_pstrdup
	movq	%rax, (%r14)
	movq	_SVN_NO_ERROR@GOTPCREL(%rip), %rax
	movq	(%rax), %rax
	addq	$56, %rsp
	popq	%rbx
	popq	%r12
	popq	%r13
	popq	%r14
	popq	%r15
	popq	%rbp
	retq
	.cfi_endproc
                                        ## -- End function
	.comm	_svn_wc_operation_update,8,3    ## @svn_wc_operation_update
	.comm	_svn_wc_operation_switch,8,3    ## @svn_wc_operation_switch
	.comm	_svn_wc_operation_merge,8,3     ## @svn_wc_operation_merge
	.comm	_svn_node_dir,8,3               ## @svn_node_dir
	.section	__TEXT,__cstring,cstring_literals
L_.str:                                 ## @.str
	.asciz	"Changes destined for a directory arrived during merge of\n'^/%s:%ld'."

	.comm	_svn_node_file,8,3              ## @svn_node_file
	.comm	_svn_node_symlink,8,3           ## @svn_node_symlink
L_.str.1:                               ## @.str.1
	.asciz	"Changes destined for a file arrived during merge of\n'^/%s:%ld'."

L_.str.2:                               ## @.str.2
	.asciz	"Changes arrived during merge of\n'^/%s:%ld'."

	.comm	_SVN_NO_ERROR,8,3               ## @SVN_NO_ERROR
L_.str.3:                               ## @.str.3
	.asciz	"Changes destined for a directory arrived via the following revisions during merge of\n'^/%s:%ld-%ld'"

L_.str.4:                               ## @.str.4
	.asciz	"Changes destined for a file arrived via the following revisions during merge of\n'^/%s:%ld-%ld'"

L_.str.5:                               ## @.str.5
	.asciz	"Changes from the following revisions arrived during merge of\n'^/%s:%ld-%ld'"

L_.str.6:                               ## @.str.6
	.asciz	"Changes destined for a directory arrived during reverse-merge of\n'^/%s:%ld'."

L_.str.7:                               ## @.str.7
	.asciz	"Changes destined for a file arrived during reverse-merge of\n'^/%s:%ld'."

L_.str.8:                               ## @.str.8
	.asciz	"Changes arrived during reverse-merge of\n'^/%s:%ld'."

L_.str.9:                               ## @.str.9
	.asciz	"Changes destined for a directory arrived via the following revisions during reverse-merge of\n'^/%s:%ld-%ld'"

L_.str.10:                              ## @.str.10
	.asciz	"Changes destined for a file arrived via the following revisions during reverse-merge of\n'^/%s:%ld-%ld'"

L_.str.11:                              ## @.str.11
	.asciz	"Changes from the following revisions arrived during reverse-merge of\n'^/%s:%ld-%ld'"

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

	.no_dead_strip	_conflict_tree_get_description_incoming_edit
.subsections_via_symbols

	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	2                               ; -- Begin function conflict_tree_get_description_incoming_edit
_conflict_tree_get_description_incoming_edit: ; @conflict_tree_get_description_incoming_edit
	.cfi_startproc
; %bb.0:
	sub	sp, sp, #128
	.cfi_def_cfa_offset 128
	stp	x24, x23, [sp, #64]             ; 16-byte Folded Spill
	stp	x22, x21, [sp, #80]             ; 16-byte Folded Spill
	stp	x20, x19, [sp, #96]             ; 16-byte Folded Spill
	stp	x29, x30, [sp, #112]            ; 16-byte Folded Spill
	add	x29, sp, #112
	.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
	mov	x21, x4
	mov	x20, x3
	mov	x22, x1
	mov	x19, x0
	ldr	x8, [x1]
	cbz	x8, LBB0_3
; %bb.1:
	add	x0, sp, #56
	add	x1, sp, #48
	add	x2, sp, #40
	mov	x3, x22
	mov	x4, x21
	mov	x5, x21
	bl	_svn_client_conflict_get_incoming_old_repos_location
	bl	_SVN_ERR
	add	x0, sp, #32
	add	x1, sp, #24
	add	x2, sp, #16
	mov	x3, x22
	mov	x4, x21
	mov	x5, x21
	bl	_svn_client_conflict_get_incoming_new_repos_location
	bl	_SVN_ERR
	mov	x0, x22
	bl	_svn_client_conflict_get_operation
	ldr	x22, [x22]
Lloh0:
	adrp	x8, _svn_wc_operation_update@GOTPAGE
Lloh1:
	ldr	x8, [x8, _svn_wc_operation_update@GOTPAGEOFF]
Lloh2:
	ldr	x8, [x8]
	cmp	x0, x8
	b.ne	LBB0_4
; %bb.2:
	ldp	x2, x0, [sp, #40]
	ldp	x3, x1, [sp, #16]
	mov	x4, x21
	bl	_describe_incoming_edit_upon_update
	b	LBB0_39
LBB0_3:
	mov	x0, x19
	mov	x1, x22
	mov	x3, x20
	mov	x4, x21
	bl	_conflict_tree_get_incoming_description_generic
	ldp	x29, x30, [sp, #112]            ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #96]             ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #80]             ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #64]             ; 16-byte Folded Reload
	add	sp, sp, #128
	b	_svn_error_trace
LBB0_4:
Lloh3:
	adrp	x8, _svn_wc_operation_switch@GOTPAGE
Lloh4:
	ldr	x8, [x8, _svn_wc_operation_switch@GOTPAGEOFF]
Lloh5:
	ldr	x8, [x8]
	cmp	x0, x8
	b.ne	LBB0_6
; %bb.5:
	ldp	x1, x0, [sp, #24]
	ldr	x2, [sp, #16]
	mov	x3, x21
	bl	_describe_incoming_edit_upon_switch
	b	LBB0_39
LBB0_6:
Lloh6:
	adrp	x8, _svn_wc_operation_merge@GOTPAGE
Lloh7:
	ldr	x8, [x8, _svn_wc_operation_merge@GOTPAGEOFF]
Lloh8:
	ldr	x8, [x8]
                                        ; implicit-def: $x23
	cmp	x0, x8
	b.ne	LBB0_40
; %bb.7:
	ldr	x9, [sp, #48]
	ldr	x10, [sp, #24]
	cmp	x9, x10
	b.ge	LBB0_11
; %bb.8:
	add	x11, x9, #1
	ldr	x8, [sp, #16]
Lloh9:
	adrp	x9, _svn_node_dir@GOTPAGE
Lloh10:
	ldr	x9, [x9, _svn_node_dir@GOTPAGEOFF]
Lloh11:
	ldr	x9, [x9]
	cmp	x11, x10
	b.ne	LBB0_14
; %bb.9:
	cmp	x8, x9
	b.ne	LBB0_18
; %bb.10:
Lloh12:
	adrp	x0, l_.str@PAGE
Lloh13:
	add	x0, x0, l_.str@PAGEOFF
	b	LBB0_31
LBB0_11:
	add	x11, x10, #1
	ldr	x8, [sp, #16]
Lloh14:
	adrp	x10, _svn_node_dir@GOTPAGE
Lloh15:
	ldr	x10, [x10, _svn_node_dir@GOTPAGEOFF]
Lloh16:
	ldr	x10, [x10]
	cmp	x11, x9
	b.ne	LBB0_16
; %bb.12:
	cmp	x8, x10
	b.ne	LBB0_21
; %bb.13:
Lloh17:
	adrp	x0, l_.str.6@PAGE
Lloh18:
	add	x0, x0, l_.str.6@PAGEOFF
	b	LBB0_33
LBB0_14:
	cmp	x8, x9
	b.ne	LBB0_24
; %bb.15:
Lloh19:
	adrp	x0, l_.str.3@PAGE
Lloh20:
	add	x0, x0, l_.str.3@PAGEOFF
	b	LBB0_35
LBB0_16:
	cmp	x8, x10
	b.ne	LBB0_27
; %bb.17:
Lloh21:
	adrp	x0, l_.str.9@PAGE
Lloh22:
	add	x0, x0, l_.str.9@PAGEOFF
	b	LBB0_37
LBB0_18:
Lloh23:
	adrp	x9, _svn_node_file@GOTPAGE
Lloh24:
	ldr	x9, [x9, _svn_node_file@GOTPAGEOFF]
Lloh25:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_30
; %bb.19:
Lloh26:
	adrp	x9, _svn_node_symlink@GOTPAGE
Lloh27:
	ldr	x9, [x9, _svn_node_symlink@GOTPAGEOFF]
Lloh28:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_30
; %bb.20:
Lloh29:
	adrp	x0, l_.str.2@PAGE
Lloh30:
	add	x0, x0, l_.str.2@PAGEOFF
	b	LBB0_31
LBB0_21:
Lloh31:
	adrp	x9, _svn_node_file@GOTPAGE
Lloh32:
	ldr	x9, [x9, _svn_node_file@GOTPAGEOFF]
Lloh33:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_32
; %bb.22:
Lloh34:
	adrp	x9, _svn_node_symlink@GOTPAGE
Lloh35:
	ldr	x9, [x9, _svn_node_symlink@GOTPAGEOFF]
Lloh36:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_32
; %bb.23:
Lloh37:
	adrp	x0, l_.str.8@PAGE
Lloh38:
	add	x0, x0, l_.str.8@PAGEOFF
	b	LBB0_33
LBB0_24:
Lloh39:
	adrp	x9, _svn_node_file@GOTPAGE
Lloh40:
	ldr	x9, [x9, _svn_node_file@GOTPAGEOFF]
Lloh41:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_34
; %bb.25:
Lloh42:
	adrp	x9, _svn_node_symlink@GOTPAGE
Lloh43:
	ldr	x9, [x9, _svn_node_symlink@GOTPAGEOFF]
Lloh44:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_34
; %bb.26:
Lloh45:
	adrp	x0, l_.str.5@PAGE
Lloh46:
	add	x0, x0, l_.str.5@PAGEOFF
	b	LBB0_35
LBB0_27:
Lloh47:
	adrp	x9, _svn_node_file@GOTPAGE
Lloh48:
	ldr	x9, [x9, _svn_node_file@GOTPAGEOFF]
Lloh49:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_36
; %bb.28:
Lloh50:
	adrp	x9, _svn_node_symlink@GOTPAGE
Lloh51:
	ldr	x9, [x9, _svn_node_symlink@GOTPAGEOFF]
Lloh52:
	ldr	x9, [x9]
	cmp	x8, x9
	b.eq	LBB0_36
; %bb.29:
Lloh53:
	adrp	x0, l_.str.11@PAGE
Lloh54:
	add	x0, x0, l_.str.11@PAGEOFF
	b	LBB0_37
LBB0_30:
Lloh55:
	adrp	x0, l_.str.1@PAGE
Lloh56:
	add	x0, x0, l_.str.1@PAGEOFF
LBB0_31:
	bl	__
	mov	x1, x0
	ldp	x3, x2, [sp, #24]
	mov	x0, x21
	b	LBB0_41
LBB0_32:
Lloh57:
	adrp	x0, l_.str.7@PAGE
Lloh58:
	add	x0, x0, l_.str.7@PAGEOFF
LBB0_33:
	bl	__
	mov	x1, x0
	ldr	x2, [sp, #32]
	ldr	x3, [sp, #48]
	mov	x0, x21
	b	LBB0_41
LBB0_34:
Lloh59:
	adrp	x0, l_.str.4@PAGE
Lloh60:
	add	x0, x0, l_.str.4@PAGEOFF
LBB0_35:
	bl	__
	mov	x1, x0
	ldr	x8, [sp, #48]
	add	x3, x8, #1
	ldp	x8, x2, [sp, #24]
	b	LBB0_38
LBB0_36:
Lloh61:
	adrp	x0, l_.str.10@PAGE
Lloh62:
	add	x0, x0, l_.str.10@PAGEOFF
LBB0_37:
	bl	__
	mov	x1, x0
	ldp	x8, x2, [sp, #24]
	add	x3, x8, #1
	ldr	x8, [sp, #48]
LBB0_38:
	str	x8, [sp]
	mov	x0, x21
	bl	_apr_psprintf
LBB0_39:
	mov	x23, x0
LBB0_40:
	mov	x0, x22
	mov	x1, x21
	bl	_describe_incoming_edit_list_modified_revs
	mov	x3, x0
Lloh63:
	adrp	x1, l_.str.12@PAGE
Lloh64:
	add	x1, x1, l_.str.12@PAGEOFF
	mov	x0, x21
	mov	x2, x23
LBB0_41:
	bl	_apr_psprintf
	mov	x1, x0
	mov	x0, x20
	bl	_apr_pstrdup
	str	x0, [x19]
Lloh65:
	adrp	x8, _SVN_NO_ERROR@GOTPAGE
Lloh66:
	ldr	x8, [x8, _SVN_NO_ERROR@GOTPAGEOFF]
Lloh67:
	ldr	x0, [x8]
	ldp	x29, x30, [sp, #112]            ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #96]             ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #80]             ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #64]             ; 16-byte Folded Reload
	add	sp, sp, #128
	ret
	.loh AdrpLdrGotLdr	Lloh0, Lloh1, Lloh2
	.loh AdrpLdrGotLdr	Lloh3, Lloh4, Lloh5
	.loh AdrpLdrGotLdr	Lloh6, Lloh7, Lloh8
	.loh AdrpLdrGotLdr	Lloh9, Lloh10, Lloh11
	.loh AdrpAdd	Lloh12, Lloh13
	.loh AdrpLdrGotLdr	Lloh14, Lloh15, Lloh16
	.loh AdrpAdd	Lloh17, Lloh18
	.loh AdrpAdd	Lloh19, Lloh20
	.loh AdrpAdd	Lloh21, Lloh22
	.loh AdrpLdrGotLdr	Lloh23, Lloh24, Lloh25
	.loh AdrpLdrGotLdr	Lloh26, Lloh27, Lloh28
	.loh AdrpAdd	Lloh29, Lloh30
	.loh AdrpLdrGotLdr	Lloh31, Lloh32, Lloh33
	.loh AdrpLdrGotLdr	Lloh34, Lloh35, Lloh36
	.loh AdrpAdd	Lloh37, Lloh38
	.loh AdrpLdrGotLdr	Lloh39, Lloh40, Lloh41
	.loh AdrpLdrGotLdr	Lloh42, Lloh43, Lloh44
	.loh AdrpAdd	Lloh45, Lloh46
	.loh AdrpLdrGotLdr	Lloh47, Lloh48, Lloh49
	.loh AdrpLdrGotLdr	Lloh50, Lloh51, Lloh52
	.loh AdrpAdd	Lloh53, Lloh54
	.loh AdrpAdd	Lloh55, Lloh56
	.loh AdrpAdd	Lloh57, Lloh58
	.loh AdrpAdd	Lloh59, Lloh60
	.loh AdrpAdd	Lloh61, Lloh62
	.loh AdrpAdd	Lloh63, Lloh64
	.loh AdrpLdrGotLdr	Lloh65, Lloh66, Lloh67
	.cfi_endproc
                                        ; -- End function
	.comm	_svn_wc_operation_update,8,3    ; @svn_wc_operation_update
	.comm	_svn_wc_operation_switch,8,3    ; @svn_wc_operation_switch
	.comm	_svn_wc_operation_merge,8,3     ; @svn_wc_operation_merge
	.comm	_svn_node_dir,8,3               ; @svn_node_dir
	.section	__TEXT,__cstring,cstring_literals
l_.str:                                 ; @.str
	.asciz	"Changes destined for a directory arrived during merge of\n'^/%s:%ld'."

	.comm	_svn_node_file,8,3              ; @svn_node_file
	.comm	_svn_node_symlink,8,3           ; @svn_node_symlink
l_.str.1:                               ; @.str.1
	.asciz	"Changes destined for a file arrived during merge of\n'^/%s:%ld'."

l_.str.2:                               ; @.str.2
	.asciz	"Changes arrived during merge of\n'^/%s:%ld'."

	.comm	_SVN_NO_ERROR,8,3               ; @SVN_NO_ERROR
l_.str.3:                               ; @.str.3
	.asciz	"Changes destined for a directory arrived via the following revisions during merge of\n'^/%s:%ld-%ld'"

l_.str.4:                               ; @.str.4
	.asciz	"Changes destined for a file arrived via the following revisions during merge of\n'^/%s:%ld-%ld'"

l_.str.5:                               ; @.str.5
	.asciz	"Changes from the following revisions arrived during merge of\n'^/%s:%ld-%ld'"

l_.str.6:                               ; @.str.6
	.asciz	"Changes destined for a directory arrived during reverse-merge of\n'^/%s:%ld'."

l_.str.7:                               ; @.str.7
	.asciz	"Changes destined for a file arrived during reverse-merge of\n'^/%s:%ld'."

l_.str.8:                               ; @.str.8
	.asciz	"Changes arrived during reverse-merge of\n'^/%s:%ld'."

l_.str.9:                               ; @.str.9
	.asciz	"Changes destined for a directory arrived via the following revisions during reverse-merge of\n'^/%s:%ld-%ld'"

l_.str.10:                              ; @.str.10
	.asciz	"Changes destined for a file arrived via the following revisions during reverse-merge of\n'^/%s:%ld-%ld'"

l_.str.11:                              ; @.str.11
	.asciz	"Changes from the following revisions arrived during reverse-merge of\n'^/%s:%ld-%ld'"

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

	.no_dead_strip	_conflict_tree_get_description_incoming_edit
.subsections_via_symbols
