	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	4, 0x90                         ## -- Begin function prop_conflict_new
_prop_conflict_new:                     ## @prop_conflict_new
	.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	%r9, %r14
	movq	%r8, %r12
	movq	%rcx, %r15
	movq	%rdi, -96(%rbp)                 ## 8-byte Spill
	movq	40(%rbp), %rbx
	movq	%rsi, %rdi
	movq	%rdx, %rsi
	movq	%rcx, %rdx
	movq	%r8, %rcx
	movq	%r9, %r8
	movq	%rbx, %r9
	callq	_generate_conflict_message
	movq	%rax, -56(%rbp)                 ## 8-byte Spill
	testq	%r15, %r15
	je	LBB0_1
## %bb.2:
	testq	%r12, %r12
	je	LBB0_3
LBB0_4:
	testq	%r14, %r14
	jne	LBB0_6
LBB0_5:
	movq	%rbx, %rdi
	callq	_svn_string_create_empty
	movq	%rax, %r14
LBB0_6:
	movl	(%r14), %esi
	movl	4(%r14), %edi
	callq	_svn_io_is_binary_data
	movq	%rax, %r13
	movl	(%r15), %esi
	movl	4(%r15), %edi
	callq	_svn_io_is_binary_data
	movq	%rax, -48(%rbp)                 ## 8-byte Spill
	movl	(%r12), %esi
	movl	4(%r12), %edi
	callq	_svn_io_is_binary_data
	testq	%r13, %r13
	movq	%rax, %r13
	jne	LBB0_11
## %bb.7:
	cmpq	$0, -48(%rbp)                   ## 8-byte Folded Reload
	jne	LBB0_11
## %bb.8:
	testq	%r13, %r13
	jne	LBB0_11
## %bb.9:
	movq	%rbx, %rdi
	callq	_svn_diff_file_options_create
	movq	_svn_diff_file_ignore_space_none@GOTPCREL(%rip), %rcx
	movl	(%rcx), %ecx
	movl	%ecx, 16(%rax)
	movq	_FALSE@GOTPCREL(%rip), %rcx
	movq	(%rcx), %rcx
	movq	%rcx, 8(%rax)
	movq	%rcx, (%rax)
	leaq	-64(%rbp), %rdi
	movq	%r14, %rsi
	movq	%r15, %rdx
	movq	%r12, %rcx
	movq	%rax, %r8
	movq	%rbx, %r9
	callq	_svn_diff_mem_string_diff3
	movl	%eax, %edi
	callq	_SVN_ERR
	movq	-64(%rbp), %rdi
	callq	_svn_diff_contains_conflicts
	testq	%rax, %rax
	je	LBB0_11
## %bb.10:
	leaq	L_.str(%rip), %rdi
	callq	__
	movq	%rax, -48(%rbp)                 ## 8-byte Spill
	leaq	L_.str.1(%rip), %rdi
	callq	__
	movq	%rax, -88(%rbp)                 ## 8-byte Spill
	leaq	L_.str.2(%rip), %rdi
	callq	__
	movq	%rax, -80(%rbp)                 ## 8-byte Spill
	movl	4(%r14), %edi
	movq	%rbx, %rsi
	callq	_svn_utf_cstring_from_utf8_fuzzy
	movl	%eax, %edi
	movq	%rbx, %rsi
	callq	_svn_string_create
	movq	%rax, -72(%rbp)                 ## 8-byte Spill
	movl	4(%r15), %edi
	movq	%rbx, %rsi
	callq	_svn_utf_cstring_from_utf8_fuzzy
	movl	%eax, %edi
	movq	%rbx, %rsi
	callq	_svn_string_create
	movq	%rax, %r15
	movl	4(%r12), %edi
	movq	%rbx, %rsi
	callq	_svn_utf_cstring_from_utf8_fuzzy
	movl	%eax, %edi
	movq	%rbx, %rsi
	callq	_svn_string_create
	movq	%rax, %r13
	movq	_svn_diff_conflict_display_modified_original_latest@GOTPCREL(%rip), %rax
	movl	(%rax), %r12d
	movq	%rbx, %rsi
	movq	-56(%rbp), %rbx                 ## 8-byte Reload
	movq	%rbx, %rdi
	callq	_svn_stream_from_stringbuf
	movq	%rax, %r14
	movl	(%rbx), %esi
	movq	%rax, %rdi
	callq	_svn_stream_skip
	movl	%eax, %edi
	callq	_SVN_ERR
	movq	-64(%rbp), %rsi
	subq	$8, %rsp
	leaq	L_.str.3(%rip), %r10
	movq	%r14, %rdi
	movq	-72(%rbp), %rdx                 ## 8-byte Reload
	movq	%r15, %rcx
	movq	%r13, %r8
	movq	-80(%rbp), %r9                  ## 8-byte Reload
	pushq	40(%rbp)
	pushq	24(%rbp)
	movl	16(%rbp), %eax
	pushq	%rax
	pushq	%r12
	pushq	%r10
	pushq	-88(%rbp)                       ## 8-byte Folded Reload
	pushq	-48(%rbp)                       ## 8-byte Folded Reload
	callq	_svn_diff_mem_string_output_merge3
	addq	$64, %rsp
	movl	%eax, %edi
	callq	_SVN_ERR
	movq	%r14, %rdi
	callq	_svn_stream_close
	movl	%eax, %edi
	callq	_SVN_ERR
	jmp	LBB0_21
LBB0_11:
	cmpl	$0, (%r15)
	movq	-56(%rbp), %rbx                 ## 8-byte Reload
	jle	LBB0_16
## %bb.12:
	leaq	L_.str.4(%rip), %rdi
	callq	__
	movq	%rbx, %rdi
	movq	%rax, %rsi
	callq	_svn_stringbuf_appendcstr
	cmpq	$0, -48(%rbp)                   ## 8-byte Folded Reload
	je	LBB0_14
## %bb.13:
	leaq	L_.str.5(%rip), %rdi
	callq	__
	movq	%rbx, %rdi
	movq	%rax, %rsi
	callq	_svn_stringbuf_appendcstr
	jmp	LBB0_15
LBB0_1:
	movq	%rbx, %rdi
	callq	_svn_string_create_empty
	movq	%rax, %r15
	testq	%r12, %r12
	jne	LBB0_4
LBB0_3:
	movq	%rbx, %rdi
	callq	_svn_string_create_empty
	movq	%rax, %r12
	testq	%r14, %r14
	jne	LBB0_6
	jmp	LBB0_5
LBB0_14:
	movl	(%r15), %edx
	movl	4(%r15), %esi
	movq	%rbx, %rdi
	callq	_svn_stringbuf_appendbytes
LBB0_15:
	leaq	L_.str.6(%rip), %rsi
	movq	%rbx, %rdi
	callq	_svn_stringbuf_appendcstr
LBB0_16:
	cmpl	$0, (%r12)
	jle	LBB0_21
## %bb.17:
	leaq	L_.str.7(%rip), %rdi
	callq	__
	movq	%rbx, %rdi
	movq	%rax, %rsi
	callq	_svn_stringbuf_appendcstr
	testq	%r13, %r13
	je	LBB0_19
## %bb.18:
	leaq	L_.str.5(%rip), %rdi
	callq	__
	movq	%rbx, %rdi
	movq	%rax, %rsi
	callq	_svn_stringbuf_appendcstr
	jmp	LBB0_20
LBB0_19:
	movl	(%r12), %edx
	movl	4(%r12), %esi
	movq	%rbx, %rdi
	callq	_svn_stringbuf_appendbytes
LBB0_20:
	leaq	L_.str.6(%rip), %rsi
	movq	%rbx, %rdi
	callq	_svn_stringbuf_appendcstr
LBB0_21:
	movq	%rbx, %rdi
	movq	32(%rbp), %rsi
	callq	_svn_string_create_from_buf
	movq	-96(%rbp), %rcx                 ## 8-byte Reload
	movq	%rax, (%rcx)
	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_diff_file_ignore_space_none,4,2 ## @svn_diff_file_ignore_space_none
	.comm	_FALSE,8,3                      ## @FALSE
	.section	__TEXT,__cstring,cstring_literals
L_.str:                                 ## @.str
	.asciz	"<<<<<<< (local property value)"

L_.str.1:                               ## @.str.1
	.asciz	">>>>>>> (incoming 'changed to' value)"

L_.str.2:                               ## @.str.2
	.asciz	"||||||| (incoming 'changed from' value)"

L_.str.3:                               ## @.str.3
	.asciz	"======="

	.comm	_svn_diff_conflict_display_modified_original_latest,4,2 ## @svn_diff_conflict_display_modified_original_latest
	.comm	_SVN_NO_ERROR,8,3               ## @SVN_NO_ERROR
L_.str.4:                               ## @.str.4
	.asciz	"Local property value:\n"

L_.str.5:                               ## @.str.5
	.asciz	"Cannot display: property value is binary data\n"

L_.str.6:                               ## @.str.6
	.asciz	"\n"

L_.str.7:                               ## @.str.7
	.asciz	"Incoming property value:\n"

	.no_dead_strip	_prop_conflict_new
.subsections_via_symbols

	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.p2align	2                               ; -- Begin function prop_conflict_new
_prop_conflict_new:                     ; @prop_conflict_new
	.cfi_startproc
; %bb.0:
	sub	sp, sp, #176
	.cfi_def_cfa_offset 176
	stp	x28, x27, [sp, #80]             ; 16-byte Folded Spill
	stp	x26, x25, [sp, #96]             ; 16-byte Folded Spill
	stp	x24, x23, [sp, #112]            ; 16-byte Folded Spill
	stp	x22, x21, [sp, #128]            ; 16-byte Folded Spill
	stp	x20, x19, [sp, #144]            ; 16-byte Folded Spill
	stp	x29, x30, [sp, #160]            ; 16-byte Folded Spill
	add	x29, sp, #160
	.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	x7, [sp, #56]                   ; 8-byte Folded Spill
	str	w6, [sp, #68]                   ; 4-byte Folded Spill
	mov	x27, x5
	mov	x22, x4
	mov	x26, x3
	mov	x19, x0
	ldr	x25, [x29, #24]
	mov	x0, x1
	mov	x1, x2
	mov	x2, x3
	mov	x3, x4
	mov	x4, x5
	mov	x5, x25
	bl	_generate_conflict_message
	mov	x20, x0
	cbz	x26, LBB0_12
; %bb.1:
	cbz	x22, LBB0_13
LBB0_2:
	ldr	x21, [x29, #16]
	cbnz	x27, LBB0_4
LBB0_3:
	mov	x0, x25
	bl	_svn_string_create_empty
	mov	x27, x0
LBB0_4:
	ldp	w1, w0, [x27]
	bl	_svn_io_is_binary_data
	mov	x24, x0
	ldp	w1, w0, [x26]
	bl	_svn_io_is_binary_data
	mov	x23, x0
	ldp	w1, w0, [x22]
	bl	_svn_io_is_binary_data
	mov	x28, x0
	cbnz	x24, LBB0_9
; %bb.5:
	cbnz	x23, LBB0_9
; %bb.6:
	cbnz	x28, LBB0_9
; %bb.7:
	mov	x0, x25
	bl	_svn_diff_file_options_create
	mov	x4, x0
Lloh0:
	adrp	x8, _svn_diff_file_ignore_space_none@GOTPAGE
Lloh1:
	ldr	x8, [x8, _svn_diff_file_ignore_space_none@GOTPAGEOFF]
Lloh2:
	ldr	w8, [x8]
	str	w8, [x0, #16]
Lloh3:
	adrp	x8, _FALSE@GOTPAGE
Lloh4:
	ldr	x8, [x8, _FALSE@GOTPAGEOFF]
Lloh5:
	ldr	x8, [x8]
	stp	x8, x8, [x0]
	add	x0, sp, #72
	mov	x1, x27
	mov	x2, x26
	mov	x3, x22
	mov	x5, x25
	bl	_svn_diff_mem_string_diff3
	bl	_SVN_ERR
	ldr	x0, [sp, #72]
	bl	_svn_diff_contains_conflicts
	cbz	x0, LBB0_9
; %bb.8:
Lloh6:
	adrp	x0, l_.str@PAGE
Lloh7:
	add	x0, x0, l_.str@PAGEOFF
	bl	__
	str	x0, [sp, #48]                   ; 8-byte Folded Spill
Lloh8:
	adrp	x0, l_.str.1@PAGE
Lloh9:
	add	x0, x0, l_.str.1@PAGEOFF
	bl	__
	str	x0, [sp, #40]                   ; 8-byte Folded Spill
Lloh10:
	adrp	x0, l_.str.2@PAGE
Lloh11:
	add	x0, x0, l_.str.2@PAGEOFF
	bl	__
	mov	x24, x0
	ldr	w0, [x27, #4]
	mov	x1, x25
	bl	_svn_utf_cstring_from_utf8_fuzzy
	mov	x1, x25
	bl	_svn_string_create
	mov	x27, x0
	ldr	w0, [x26, #4]
	mov	x1, x25
	bl	_svn_utf_cstring_from_utf8_fuzzy
	mov	x1, x25
	bl	_svn_string_create
	mov	x26, x0
	ldr	w0, [x22, #4]
	mov	x1, x25
	bl	_svn_utf_cstring_from_utf8_fuzzy
	mov	x1, x25
	bl	_svn_string_create
	mov	x22, x0
Lloh12:
	adrp	x8, _svn_diff_conflict_display_modified_original_latest@GOTPAGE
Lloh13:
	ldr	x8, [x8, _svn_diff_conflict_display_modified_original_latest@GOTPAGEOFF]
Lloh14:
	ldr	w28, [x8]
	mov	x0, x20
	mov	x1, x25
	bl	_svn_stream_from_stringbuf
	mov	x23, x19
	mov	x19, x0
	ldr	w1, [x20]
	bl	_svn_stream_skip
	bl	_SVN_ERR
	ldr	x1, [sp, #72]
	ldp	x6, x8, [sp, #48]               ; 16-byte Folded Reload
	stp	x8, x25, [sp, #16]
	ldr	w8, [sp, #68]                   ; 4-byte Folded Reload
	stp	w28, w8, [sp, #8]
Lloh15:
	adrp	x8, l_.str.3@PAGE
Lloh16:
	add	x8, x8, l_.str.3@PAGEOFF
	str	x8, [sp]
	mov	x0, x19
	mov	x2, x27
	mov	x3, x26
	mov	x4, x22
	mov	x5, x24
	ldr	x7, [sp, #40]                   ; 8-byte Folded Reload
	bl	_svn_diff_mem_string_output_merge3
	bl	_SVN_ERR
	mov	x0, x19
	mov	x19, x23
	bl	_svn_stream_close
	bl	_SVN_ERR
	b	LBB0_21
LBB0_9:
	ldr	w8, [x26]
	cmp	w8, #1
	b.lt	LBB0_16
; %bb.10:
Lloh17:
	adrp	x0, l_.str.4@PAGE
Lloh18:
	add	x0, x0, l_.str.4@PAGEOFF
	bl	__
	mov	x1, x0
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
	cbz	x23, LBB0_14
; %bb.11:
Lloh19:
	adrp	x0, l_.str.5@PAGE
Lloh20:
	add	x0, x0, l_.str.5@PAGEOFF
	bl	__
	mov	x1, x0
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
	b	LBB0_15
LBB0_12:
	mov	x0, x25
	bl	_svn_string_create_empty
	mov	x26, x0
	cbnz	x22, LBB0_2
LBB0_13:
	mov	x0, x25
	bl	_svn_string_create_empty
	mov	x22, x0
	ldr	x21, [x29, #16]
	cbnz	x27, LBB0_4
	b	LBB0_3
LBB0_14:
	ldp	w2, w1, [x26]
	mov	x0, x20
	bl	_svn_stringbuf_appendbytes
LBB0_15:
Lloh21:
	adrp	x1, l_.str.6@PAGE
Lloh22:
	add	x1, x1, l_.str.6@PAGEOFF
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
LBB0_16:
	ldr	w8, [x22]
	cmp	w8, #1
	b.lt	LBB0_21
; %bb.17:
Lloh23:
	adrp	x0, l_.str.7@PAGE
Lloh24:
	add	x0, x0, l_.str.7@PAGEOFF
	bl	__
	mov	x1, x0
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
	cbz	x28, LBB0_19
; %bb.18:
Lloh25:
	adrp	x0, l_.str.5@PAGE
Lloh26:
	add	x0, x0, l_.str.5@PAGEOFF
	bl	__
	mov	x1, x0
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
	b	LBB0_20
LBB0_19:
	ldp	w2, w1, [x22]
	mov	x0, x20
	bl	_svn_stringbuf_appendbytes
LBB0_20:
Lloh27:
	adrp	x1, l_.str.6@PAGE
Lloh28:
	add	x1, x1, l_.str.6@PAGEOFF
	mov	x0, x20
	bl	_svn_stringbuf_appendcstr
LBB0_21:
	mov	x0, x20
	mov	x1, x21
	bl	_svn_string_create_from_buf
	str	x0, [x19]
Lloh29:
	adrp	x8, _SVN_NO_ERROR@GOTPAGE
Lloh30:
	ldr	x8, [x8, _SVN_NO_ERROR@GOTPAGEOFF]
Lloh31:
	ldr	x0, [x8]
	ldp	x29, x30, [sp, #160]            ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #144]            ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #128]            ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #112]            ; 16-byte Folded Reload
	ldp	x26, x25, [sp, #96]             ; 16-byte Folded Reload
	ldp	x28, x27, [sp, #80]             ; 16-byte Folded Reload
	add	sp, sp, #176
	ret
	.loh AdrpLdrGotLdr	Lloh3, Lloh4, Lloh5
	.loh AdrpLdrGotLdr	Lloh0, Lloh1, Lloh2
	.loh AdrpAdd	Lloh15, Lloh16
	.loh AdrpLdrGotLdr	Lloh12, Lloh13, Lloh14
	.loh AdrpAdd	Lloh10, Lloh11
	.loh AdrpAdd	Lloh8, Lloh9
	.loh AdrpAdd	Lloh6, Lloh7
	.loh AdrpAdd	Lloh17, Lloh18
	.loh AdrpAdd	Lloh19, Lloh20
	.loh AdrpAdd	Lloh21, Lloh22
	.loh AdrpAdd	Lloh23, Lloh24
	.loh AdrpAdd	Lloh25, Lloh26
	.loh AdrpAdd	Lloh27, Lloh28
	.loh AdrpLdrGotLdr	Lloh29, Lloh30, Lloh31
	.cfi_endproc
                                        ; -- End function
	.comm	_svn_diff_file_ignore_space_none,4,2 ; @svn_diff_file_ignore_space_none
	.comm	_FALSE,8,3                      ; @FALSE
	.section	__TEXT,__cstring,cstring_literals
l_.str:                                 ; @.str
	.asciz	"<<<<<<< (local property value)"

l_.str.1:                               ; @.str.1
	.asciz	">>>>>>> (incoming 'changed to' value)"

l_.str.2:                               ; @.str.2
	.asciz	"||||||| (incoming 'changed from' value)"

l_.str.3:                               ; @.str.3
	.asciz	"======="

	.comm	_svn_diff_conflict_display_modified_original_latest,4,2 ; @svn_diff_conflict_display_modified_original_latest
	.comm	_SVN_NO_ERROR,8,3               ; @SVN_NO_ERROR
l_.str.4:                               ; @.str.4
	.asciz	"Local property value:\n"

l_.str.5:                               ; @.str.5
	.asciz	"Cannot display: property value is binary data\n"

l_.str.6:                               ; @.str.6
	.asciz	"\n"

l_.str.7:                               ; @.str.7
	.asciz	"Incoming property value:\n"

	.no_dead_strip	_prop_conflict_new
.subsections_via_symbols
