summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/config
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/config')
-rw-r--r--tests/resources/merge-resolve/.gitted/config8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/config b/tests/resources/merge-resolve/.gitted/config
new file mode 100644
index 0000000..26c4842
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/config
@@ -0,0 +1,8 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+[submodule "submodule"]
+ url = ../submodule