Merge branch 'improvements'

4 files changed, 47 insertions, 0 deletions

diff --git a/test/fixtures/git_config b/test/fixtures/git_config
new file mode 100644
index 00000000..3c91985f
--- /dev/null
+++ b/test/fixtures/git_config
@@ -0,0 +1,23 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = git://gitorious.org/~byron/git-python/byrons-clone.git
+	pushurl = git@gitorious.org:~byron/git-python/byrons-clone.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[remote "mainline"]
+	url = git://gitorious.org/git-python/mainline.git
+	fetch = +refs/heads/*:refs/remotes/mainline/*
+[remote "MartinMarcher"]
+	url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git
+	fetch = +refs/heads/*:refs/remotes/MartinMarcher/*
+[gui]
+	geometry = 1316x820+219+243 207 192
+[branch "mainline_performance"]
+	remote = mainline
+	merge = refs/heads/master
diff --git a/test/fixtures/git_config_global b/test/fixtures/git_config_global
new file mode 100644
index 00000000..1a55397f
--- /dev/null
+++ b/test/fixtures/git_config_global
@@ -0,0 +1,24 @@
+[alias]
+	st = status
+	ci = commit
+	co = checkout
+	br = branch
+[color]
+	branch = auto
+	diff = auto
+	interactive = auto
+	status = auto
+[user]
+	name = Sebastian Thiel
+	email = byronimo@gmail.com
+[core]
+	editor = vim
+	autocrlf = false
+	packedGitLimit = 1g
+	packedGitWindowSize = 512m
+[pack]
+	windowMemory = 512m
+[merge]
+	tool = meld
+[diff]
+	tool = meld
diff --git a/test/fixtures/index b/test/fixtures/index
new file mode 100644
index 00000000..40914bac
--- /dev/null
+++ b/test/fixtures/index
diff --git a/test/fixtures/index_merge b/test/fixtures/index_merge
new file mode 100644
index 00000000..2a743455
--- /dev/null
+++ b/test/fixtures/index_merge