aboutsummaryrefslogtreecommitdiff
path: root/git/test/fixtures/index_merge
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-11-25 17:01:25 +0100
committerSebastian Thiel <byronimo@gmail.com>2010-11-25 17:01:25 +0100
commitcb68eef0865df6aedbc11cd81888625a70da6777 (patch)
treebd3018e6257574687b271b6c2e652ef943657471 /git/test/fixtures/index_merge
parent65747a216c67c3101c6ae2edaa8119d786b793cb (diff)
downloadGitPython-cb68eef0865df6aedbc11cd81888625a70da6777.tar.gz
GitPython-cb68eef0865df6aedbc11cd81888625a70da6777.zip
Moved everything into the git subdirectory - some tests still need to be adjusted
Diffstat (limited to 'git/test/fixtures/index_merge')
-rw-r--r--git/test/fixtures/index_mergebin0 -> 9192 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/git/test/fixtures/index_merge b/git/test/fixtures/index_merge
new file mode 100644
index 00000000..2a743455
--- /dev/null
+++ b/git/test/fixtures/index_merge
Binary files differ