	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.globl	_svn_client_conflict_text_get_resolution_options ## -- Begin function svn_client_conflict_text_get_resolution_options
	.p2align	4, 0x90
_svn_client_conflict_text_get_resolution_options: ## @svn_client_conflict_text_get_resolution_options
	.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	%rcx, %rbx
	movq	%rsi, %r12
	movq	%rdi, %r14
	movq	%rsi, %rdi
	movq	%r8, %rsi
	callq	_assert_text_conflict
	movl	%eax, %edi
	callq	_SVN_ERR
	movq	%rbx, %rdi
	movl	$7, %esi
	movl	$8, %edx
	callq	_apr_array_make
	movq	%rax, %rbx
	movq	%rax, (%r14)
	movq	_svn_client_conflict_option_postpone@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str(%rip), %rdi
	callq	__
	movl	%eax, %r13d
	leaq	L_.str.1(%rip), %rdi
	callq	__
	movq	_resolve_postpone@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%rbx, %rdi
	movq	%r12, %rsi
	movl	%r15d, %edx
	movl	%r13d, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	movq	%r12, %rdi
	callq	_svn_client_conflict_text_get_mime_type
	testq	%rax, %rax
	je	LBB0_3
## %bb.1:
	movq	%rax, %rdi
	callq	_svn_mime_type_is_binary
	testq	%rax, %rax
	je	LBB0_3
## %bb.2:
	leaq	L_.str.7(%rip), %rax
	movq	%rax, -88(%rbp)                 ## 8-byte Spill
	movq	_svn_client_conflict_option_working_text@GOTPCREL(%rip), %rax
	movq	%rax, -80(%rbp)                 ## 8-byte Spill
	leaq	L_.str.5(%rip), %rax
	movq	%rax, -72(%rbp)                 ## 8-byte Spill
	leaq	L_.str.4(%rip), %rax
	movq	%rax, -64(%rbp)                 ## 8-byte Spill
	movq	_svn_client_conflict_option_incoming_text@GOTPCREL(%rip), %rax
	movq	%rax, -56(%rbp)                 ## 8-byte Spill
	leaq	L_.str.3(%rip), %rax
	movq	%rax, -48(%rbp)                 ## 8-byte Spill
	leaq	L_.str.2(%rip), %rdi
	movq	_svn_client_conflict_option_base_text@GOTPCREL(%rip), %rax
	jmp	LBB0_4
LBB0_3:
	movq	(%r14), %r13
	movq	_svn_client_conflict_option_base_text@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str.2(%rip), %rdi
	callq	__
	movl	%eax, %ebx
	leaq	L_.str.8(%rip), %rdi
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%r13, %rdi
	movq	%r12, %rsi
	movl	%r15d, %edx
	movl	%ebx, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	movq	(%r14), %r13
	movq	_svn_client_conflict_option_incoming_text@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str.4(%rip), %rdi
	callq	__
	movl	%eax, %ebx
	leaq	L_.str.9(%rip), %rdi
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%r13, %rdi
	movq	%r12, %rsi
	movl	%r15d, %edx
	movl	%ebx, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	movq	(%r14), %r13
	movq	_svn_client_conflict_option_working_text@GOTPCREL(%rip), %rax
	movl	(%rax), %r15d
	leaq	L_.str.10(%rip), %rdi
	callq	__
	movl	%eax, %ebx
	leaq	L_.str.11(%rip), %rdi
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%r13, %rdi
	movq	%r12, %rsi
	movl	%r15d, %edx
	movl	%ebx, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	leaq	L_.str.16(%rip), %rax
	movq	%rax, -88(%rbp)                 ## 8-byte Spill
	movq	_svn_client_conflict_option_merged_text@GOTPCREL(%rip), %rax
	movq	%rax, -80(%rbp)                 ## 8-byte Spill
	leaq	L_.str.15(%rip), %rax
	movq	%rax, -72(%rbp)                 ## 8-byte Spill
	leaq	L_.str.14(%rip), %rax
	movq	%rax, -64(%rbp)                 ## 8-byte Spill
	movq	_svn_client_conflict_option_working_text_where_conflicted@GOTPCREL(%rip), %rax
	movq	%rax, -56(%rbp)                 ## 8-byte Spill
	leaq	L_.str.13(%rip), %rax
	movq	%rax, -48(%rbp)                 ## 8-byte Spill
	leaq	L_.str.12(%rip), %rdi
	movq	_svn_client_conflict_option_incoming_text_where_conflicted@GOTPCREL(%rip), %rax
LBB0_4:
	movq	(%r14), %rbx
	movl	(%rax), %r13d
	callq	__
	movl	%eax, %r15d
	movq	-48(%rbp), %rdi                 ## 8-byte Reload
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%rbx, %rdi
	movq	%r12, %rsi
	movl	%r13d, %edx
	movl	%r15d, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	movq	(%r14), %r15
	movq	%r14, %r13
	movq	-56(%rbp), %rax                 ## 8-byte Reload
	movl	(%rax), %r14d
	movq	-64(%rbp), %rdi                 ## 8-byte Reload
	callq	__
	movl	%eax, %ebx
	movq	-72(%rbp), %rdi                 ## 8-byte Reload
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%r15, %rdi
	movq	%r12, %rsi
	movl	%r14d, %edx
	movl	%ebx, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	movq	(%r13), %r15
	movq	-80(%rbp), %rax                 ## 8-byte Reload
	movl	(%rax), %r14d
	leaq	L_.str.6(%rip), %rdi
	callq	__
	movl	%eax, %ebx
	movq	-88(%rbp), %rdi                 ## 8-byte Reload
	callq	__
	movq	_resolve_text_conflict@GOTPCREL(%rip), %rcx
	movl	(%rcx), %r9d
	movq	%r15, %rdi
	movq	%r12, %rsi
	movl	%r14d, %edx
	movl	%ebx, %ecx
	movl	%eax, %r8d
	callq	_add_resolution_option
	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_client_conflict_option_postpone,4,2 ## @svn_client_conflict_option_postpone
	.section	__TEXT,__cstring,cstring_literals
L_.str:                                 ## @.str
	.asciz	"Postpone"

L_.str.1:                               ## @.str.1
	.asciz	"skip this conflict and leave it unresolved"

	.comm	_resolve_postpone,4,2           ## @resolve_postpone
	.comm	_svn_client_conflict_option_base_text,4,2 ## @svn_client_conflict_option_base_text
L_.str.2:                               ## @.str.2
	.asciz	"Accept base"

L_.str.3:                               ## @.str.3
	.asciz	"discard local and incoming changes for this binary file"

	.comm	_resolve_text_conflict,4,2      ## @resolve_text_conflict
	.comm	_svn_client_conflict_option_incoming_text,4,2 ## @svn_client_conflict_option_incoming_text
L_.str.4:                               ## @.str.4
	.asciz	"Accept incoming"

L_.str.5:                               ## @.str.5
	.asciz	"accept incoming version of binary file"

	.comm	_svn_client_conflict_option_working_text,4,2 ## @svn_client_conflict_option_working_text
L_.str.6:                               ## @.str.6
	.asciz	"Mark as resolved"

L_.str.7:                               ## @.str.7
	.asciz	"accept binary file as it appears in the working copy"

L_.str.8:                               ## @.str.8
	.asciz	"discard local and incoming changes for this file"

L_.str.9:                               ## @.str.9
	.asciz	"accept incoming version of entire file"

L_.str.10:                              ## @.str.10
	.asciz	"Reject incoming"

L_.str.11:                              ## @.str.11
	.asciz	"reject all incoming changes for this file"

	.comm	_svn_client_conflict_option_incoming_text_where_conflicted,4,2 ## @svn_client_conflict_option_incoming_text_where_conflicted
L_.str.12:                              ## @.str.12
	.asciz	"Accept incoming for conflicts"

L_.str.13:                              ## @.str.13
	.asciz	"accept changes only where they conflict"

	.comm	_svn_client_conflict_option_working_text_where_conflicted,4,2 ## @svn_client_conflict_option_working_text_where_conflicted
L_.str.14:                              ## @.str.14
	.asciz	"Reject conflicts"

L_.str.15:                              ## @.str.15
	.asciz	"reject changes which conflict and accept the rest"

	.comm	_svn_client_conflict_option_merged_text,4,2 ## @svn_client_conflict_option_merged_text
L_.str.16:                              ## @.str.16
	.asciz	"accept the file as it appears in the working copy"

	.comm	_SVN_NO_ERROR,8,3               ## @SVN_NO_ERROR
.subsections_via_symbols

	.section	__TEXT,__text,regular,pure_instructions
	.build_version macos, 13, 0	sdk_version 13, 3
	.globl	_svn_client_conflict_text_get_resolution_options ; -- Begin function svn_client_conflict_text_get_resolution_options
	.p2align	2
_svn_client_conflict_text_get_resolution_options: ; @svn_client_conflict_text_get_resolution_options
	.cfi_startproc
; %bb.0:
	sub	sp, sp, #112
	.cfi_def_cfa_offset 112
	stp	x28, x27, [sp, #16]             ; 16-byte Folded Spill
	stp	x26, x25, [sp, #32]             ; 16-byte Folded Spill
	stp	x24, x23, [sp, #48]             ; 16-byte Folded Spill
	stp	x22, x21, [sp, #64]             ; 16-byte Folded Spill
	stp	x20, x19, [sp, #80]             ; 16-byte Folded Spill
	stp	x29, x30, [sp, #96]             ; 16-byte Folded Spill
	add	x29, sp, #96
	.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	x21, x3
	mov	x19, x1
	mov	x20, x0
	mov	x0, x1
	mov	x1, x4
	bl	_assert_text_conflict
	bl	_SVN_ERR
	mov	x0, x21
	mov	w1, #7
	mov	w2, #8
	bl	_apr_array_make
	mov	x21, x0
	str	x0, [x20]
Lloh0:
	adrp	x8, _svn_client_conflict_option_postpone@GOTPAGE
Lloh1:
	ldr	x8, [x8, _svn_client_conflict_option_postpone@GOTPAGEOFF]
Lloh2:
	ldr	w22, [x8]
Lloh3:
	adrp	x0, l_.str@PAGE
Lloh4:
	add	x0, x0, l_.str@PAGEOFF
	bl	__
	mov	x23, x0
Lloh5:
	adrp	x0, l_.str.1@PAGE
Lloh6:
	add	x0, x0, l_.str.1@PAGEOFF
	bl	__
	mov	x4, x0
Lloh7:
	adrp	x8, _resolve_postpone@GOTPAGE
Lloh8:
	ldr	x8, [x8, _resolve_postpone@GOTPAGEOFF]
Lloh9:
	ldr	w5, [x8]
	mov	x0, x21
	mov	x1, x19
	mov	x2, x22
	mov	x3, x23
	bl	_add_resolution_option
	mov	x0, x19
	bl	_svn_client_conflict_text_get_mime_type
Lloh10:
	adrp	x28, _resolve_text_conflict@GOTPAGE
Lloh11:
	ldr	x28, [x28, _resolve_text_conflict@GOTPAGEOFF]
	cbz	x0, LBB0_3
; %bb.1:
	bl	_svn_mime_type_is_binary
	cbz	x0, LBB0_3
; %bb.2:
Lloh12:
	adrp	x8, l_.str.7@PAGE
Lloh13:
	add	x8, x8, l_.str.7@PAGEOFF
	str	x8, [sp, #8]                    ; 8-byte Folded Spill
Lloh14:
	adrp	x8, _svn_client_conflict_option_working_text@GOTPAGE
Lloh15:
	ldr	x8, [x8, _svn_client_conflict_option_working_text@GOTPAGEOFF]
	str	x8, [sp]                        ; 8-byte Folded Spill
Lloh16:
	adrp	x22, l_.str.5@PAGE
Lloh17:
	add	x22, x22, l_.str.5@PAGEOFF
Lloh18:
	adrp	x23, l_.str.4@PAGE
Lloh19:
	add	x23, x23, l_.str.4@PAGEOFF
Lloh20:
	adrp	x21, _svn_client_conflict_option_incoming_text@GOTPAGE
Lloh21:
	ldr	x21, [x21, _svn_client_conflict_option_incoming_text@GOTPAGEOFF]
Lloh22:
	adrp	x24, l_.str.3@PAGE
Lloh23:
	add	x24, x24, l_.str.3@PAGEOFF
Lloh24:
	adrp	x8, _svn_client_conflict_option_base_text@GOTPAGE
Lloh25:
	ldr	x8, [x8, _svn_client_conflict_option_base_text@GOTPAGEOFF]
Lloh26:
	adrp	x0, l_.str.2@PAGE
Lloh27:
	add	x0, x0, l_.str.2@PAGEOFF
	b	LBB0_4
LBB0_3:
Lloh28:
	adrp	x8, _svn_client_conflict_option_base_text@GOTPAGE
Lloh29:
	ldr	x8, [x8, _svn_client_conflict_option_base_text@GOTPAGEOFF]
Lloh30:
	adrp	x24, _svn_client_conflict_option_incoming_text@GOTPAGE
Lloh31:
	ldr	x24, [x24, _svn_client_conflict_option_incoming_text@GOTPAGEOFF]
Lloh32:
	adrp	x25, _svn_client_conflict_option_working_text@GOTPAGE
Lloh33:
	ldr	x25, [x25, _svn_client_conflict_option_working_text@GOTPAGEOFF]
	ldr	x21, [x20]
Lloh34:
	ldr	w22, [x8]
Lloh35:
	adrp	x0, l_.str.2@PAGE
Lloh36:
	add	x0, x0, l_.str.2@PAGEOFF
	bl	__
	mov	x23, x0
Lloh37:
	adrp	x0, l_.str.8@PAGE
Lloh38:
	add	x0, x0, l_.str.8@PAGEOFF
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x21
	mov	x1, x19
	mov	x2, x22
	mov	x3, x23
	bl	_add_resolution_option
	ldr	x21, [x20]
Lloh39:
	ldr	w22, [x24]
Lloh40:
	adrp	x0, l_.str.4@PAGE
Lloh41:
	add	x0, x0, l_.str.4@PAGEOFF
	bl	__
	mov	x23, x0
Lloh42:
	adrp	x0, l_.str.9@PAGE
Lloh43:
	add	x0, x0, l_.str.9@PAGEOFF
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x21
	mov	x1, x19
	mov	x2, x22
	mov	x3, x23
	bl	_add_resolution_option
	ldr	x21, [x20]
Lloh44:
	ldr	w22, [x25]
Lloh45:
	adrp	x0, l_.str.10@PAGE
Lloh46:
	add	x0, x0, l_.str.10@PAGEOFF
	bl	__
	mov	x23, x0
Lloh47:
	adrp	x0, l_.str.11@PAGE
Lloh48:
	add	x0, x0, l_.str.11@PAGEOFF
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x21
	mov	x1, x19
	mov	x2, x22
	mov	x3, x23
	bl	_add_resolution_option
Lloh49:
	adrp	x8, l_.str.16@PAGE
Lloh50:
	add	x8, x8, l_.str.16@PAGEOFF
	str	x8, [sp, #8]                    ; 8-byte Folded Spill
Lloh51:
	adrp	x8, _svn_client_conflict_option_merged_text@GOTPAGE
Lloh52:
	ldr	x8, [x8, _svn_client_conflict_option_merged_text@GOTPAGEOFF]
	str	x8, [sp]                        ; 8-byte Folded Spill
Lloh53:
	adrp	x22, l_.str.15@PAGE
Lloh54:
	add	x22, x22, l_.str.15@PAGEOFF
Lloh55:
	adrp	x23, l_.str.14@PAGE
Lloh56:
	add	x23, x23, l_.str.14@PAGEOFF
Lloh57:
	adrp	x21, _svn_client_conflict_option_working_text_where_conflicted@GOTPAGE
Lloh58:
	ldr	x21, [x21, _svn_client_conflict_option_working_text_where_conflicted@GOTPAGEOFF]
Lloh59:
	adrp	x24, l_.str.13@PAGE
Lloh60:
	add	x24, x24, l_.str.13@PAGEOFF
Lloh61:
	adrp	x8, _svn_client_conflict_option_incoming_text_where_conflicted@GOTPAGE
Lloh62:
	ldr	x8, [x8, _svn_client_conflict_option_incoming_text_where_conflicted@GOTPAGEOFF]
Lloh63:
	adrp	x0, l_.str.12@PAGE
Lloh64:
	add	x0, x0, l_.str.12@PAGEOFF
LBB0_4:
	ldr	x25, [x20]
	ldr	w26, [x8]
	bl	__
	mov	x27, x0
	mov	x0, x24
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x25
	mov	x1, x19
	mov	x2, x26
	mov	x3, x27
	bl	_add_resolution_option
	ldr	x24, [x20]
	ldr	w25, [x21]
	mov	x0, x23
	bl	__
	mov	x23, x0
	mov	x0, x22
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x24
	mov	x1, x19
	mov	x2, x25
	mov	x3, x23
	bl	_add_resolution_option
	ldr	x20, [x20]
	ldr	x8, [sp]                        ; 8-byte Folded Reload
	ldr	w22, [x8]
Lloh65:
	adrp	x0, l_.str.6@PAGE
Lloh66:
	add	x0, x0, l_.str.6@PAGEOFF
	bl	__
	mov	x23, x0
	ldr	x0, [sp, #8]                    ; 8-byte Folded Reload
	bl	__
	mov	x4, x0
	ldr	w5, [x28]
	mov	x0, x20
	mov	x1, x19
	mov	x2, x22
	mov	x3, x23
	bl	_add_resolution_option
Lloh67:
	adrp	x8, _SVN_NO_ERROR@GOTPAGE
Lloh68:
	ldr	x8, [x8, _SVN_NO_ERROR@GOTPAGEOFF]
Lloh69:
	ldr	x0, [x8]
	ldp	x29, x30, [sp, #96]             ; 16-byte Folded Reload
	ldp	x20, x19, [sp, #80]             ; 16-byte Folded Reload
	ldp	x22, x21, [sp, #64]             ; 16-byte Folded Reload
	ldp	x24, x23, [sp, #48]             ; 16-byte Folded Reload
	ldp	x26, x25, [sp, #32]             ; 16-byte Folded Reload
	ldp	x28, x27, [sp, #16]             ; 16-byte Folded Reload
	add	sp, sp, #112
	ret
	.loh AdrpLdrGot	Lloh10, Lloh11
	.loh AdrpLdrGotLdr	Lloh7, Lloh8, Lloh9
	.loh AdrpAdd	Lloh5, Lloh6
	.loh AdrpAdd	Lloh3, Lloh4
	.loh AdrpLdrGotLdr	Lloh0, Lloh1, Lloh2
	.loh AdrpAdd	Lloh26, Lloh27
	.loh AdrpLdrGot	Lloh24, Lloh25
	.loh AdrpAdd	Lloh22, Lloh23
	.loh AdrpLdrGot	Lloh20, Lloh21
	.loh AdrpAdd	Lloh18, Lloh19
	.loh AdrpAdd	Lloh16, Lloh17
	.loh AdrpLdrGot	Lloh14, Lloh15
	.loh AdrpAdd	Lloh12, Lloh13
	.loh AdrpAdd	Lloh63, Lloh64
	.loh AdrpLdrGot	Lloh61, Lloh62
	.loh AdrpAdd	Lloh59, Lloh60
	.loh AdrpLdrGot	Lloh57, Lloh58
	.loh AdrpAdd	Lloh55, Lloh56
	.loh AdrpAdd	Lloh53, Lloh54
	.loh AdrpLdrGot	Lloh51, Lloh52
	.loh AdrpAdd	Lloh49, Lloh50
	.loh AdrpAdd	Lloh47, Lloh48
	.loh AdrpAdd	Lloh45, Lloh46
	.loh AdrpAdd	Lloh42, Lloh43
	.loh AdrpAdd	Lloh40, Lloh41
	.loh AdrpAdd	Lloh37, Lloh38
	.loh AdrpAdd	Lloh35, Lloh36
	.loh AdrpLdrGotLdr	Lloh32, Lloh33, Lloh44
	.loh AdrpLdrGotLdr	Lloh30, Lloh31, Lloh39
	.loh AdrpLdrGotLdr	Lloh28, Lloh29, Lloh34
	.loh AdrpLdrGotLdr	Lloh67, Lloh68, Lloh69
	.loh AdrpAdd	Lloh65, Lloh66
	.cfi_endproc
                                        ; -- End function
	.comm	_svn_client_conflict_option_postpone,4,2 ; @svn_client_conflict_option_postpone
	.section	__TEXT,__cstring,cstring_literals
l_.str:                                 ; @.str
	.asciz	"Postpone"

l_.str.1:                               ; @.str.1
	.asciz	"skip this conflict and leave it unresolved"

	.comm	_resolve_postpone,4,2           ; @resolve_postpone
	.comm	_svn_client_conflict_option_base_text,4,2 ; @svn_client_conflict_option_base_text
l_.str.2:                               ; @.str.2
	.asciz	"Accept base"

l_.str.3:                               ; @.str.3
	.asciz	"discard local and incoming changes for this binary file"

	.comm	_resolve_text_conflict,4,2      ; @resolve_text_conflict
	.comm	_svn_client_conflict_option_incoming_text,4,2 ; @svn_client_conflict_option_incoming_text
l_.str.4:                               ; @.str.4
	.asciz	"Accept incoming"

l_.str.5:                               ; @.str.5
	.asciz	"accept incoming version of binary file"

	.comm	_svn_client_conflict_option_working_text,4,2 ; @svn_client_conflict_option_working_text
l_.str.6:                               ; @.str.6
	.asciz	"Mark as resolved"

l_.str.7:                               ; @.str.7
	.asciz	"accept binary file as it appears in the working copy"

l_.str.8:                               ; @.str.8
	.asciz	"discard local and incoming changes for this file"

l_.str.9:                               ; @.str.9
	.asciz	"accept incoming version of entire file"

l_.str.10:                              ; @.str.10
	.asciz	"Reject incoming"

l_.str.11:                              ; @.str.11
	.asciz	"reject all incoming changes for this file"

	.comm	_svn_client_conflict_option_incoming_text_where_conflicted,4,2 ; @svn_client_conflict_option_incoming_text_where_conflicted
l_.str.12:                              ; @.str.12
	.asciz	"Accept incoming for conflicts"

l_.str.13:                              ; @.str.13
	.asciz	"accept changes only where they conflict"

	.comm	_svn_client_conflict_option_working_text_where_conflicted,4,2 ; @svn_client_conflict_option_working_text_where_conflicted
l_.str.14:                              ; @.str.14
	.asciz	"Reject conflicts"

l_.str.15:                              ; @.str.15
	.asciz	"reject changes which conflict and accept the rest"

	.comm	_svn_client_conflict_option_merged_text,4,2 ; @svn_client_conflict_option_merged_text
l_.str.16:                              ; @.str.16
	.asciz	"accept the file as it appears in the working copy"

	.comm	_SVN_NO_ERROR,8,3               ; @SVN_NO_ERROR
.subsections_via_symbols
