summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch')
-rw-r--r--tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch
new file mode 100644
index 000000000..7a2e6f822
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094594 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec