summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/refs/heads/trivial-6')
-rw-r--r--tests/resources/merge-resolve/.gitted/refs/heads/trivial-61
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6 b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6
new file mode 100644
index 0000000..fb685bb
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6
@@ -0,0 +1 @@
+99b4f7e4f24470fa06b980bc21f1095c2a9425c0