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