summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMergeConflict/expected/repo/.git_keep/config
blob: 1cff3a48914c95ab1f139e1e10722a3da7e5e97d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	ignorecase = true
	precomposeunicode = true
[user]
	email = CI@example.com
	name = CI
[remote "origin"]
	url = ../origin
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[pull]
	rebase = false