summaryrefslogtreecommitdiff
path: root/tests-clar/resources/submodules/gitmodules
diff options
context:
space:
mode:
authorBen Straub <bs@github.com>2013-09-16 16:12:31 -0700
committerBen Straub <bs@github.com>2013-09-16 16:12:31 -0700
commit549931679a77b280eb1f36afeda8930eb31d70f7 (patch)
tree2744e3e198ad146bae72f35369bbeb4f8028c8c3 /tests-clar/resources/submodules/gitmodules
parent1a68c168a6cdbe0db6e44fb582a7026a7d536c9d (diff)
parent8821c9aa5baf31e21c21825e8c91c765e6631e7f (diff)
downloadlibgit2-549931679a77b280eb1f36afeda8930eb31d70f7.tar.gz
Merge branch 'development' into blame_rebased
Conflicts: include/git2.h
Diffstat (limited to 'tests-clar/resources/submodules/gitmodules')
-rw-r--r--tests-clar/resources/submodules/gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests-clar/resources/submodules/gitmodules b/tests-clar/resources/submodules/gitmodules
index 1262f8bb0..2798b696c 100644
--- a/tests-clar/resources/submodules/gitmodules
+++ b/tests-clar/resources/submodules/gitmodules
@@ -1,3 +1,6 @@
[submodule "testrepo"]
path = testrepo
+ url =
+[submodule ""]
+ path = testrepo
url = \ No newline at end of file