summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch')
-rw-r--r--tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch
new file mode 100644
index 000000000..efc4c55ac
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch
@@ -0,0 +1 @@
+a43150a738849c59376cf30bb2a68348a83c8f48