summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2')
-rw-r--r--tests/resources/merge-resolve.git/refs/heads/trivial-5alt-21
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2 b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2
new file mode 100644
index 000000000..aa4ada17e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2
@@ -0,0 +1 @@
+3b47b031b3e55ae11e14a05260b1c3ffd6838d55