Add dummy git repo with conflict for testing

mkchoi212 · May 12, 2018 · 05c8288 · 05c8288
1 parent 83ac734
commit 05c8288
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "test"]
+	path = test
+	url = ./test
diff --git a/test b/test