summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4')
-rw-r--r--tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-42
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4 b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4
new file mode 100644
index 000000000..3ee6d2503
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4
@@ -0,0 +1,2 @@
+566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094764 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson <ethomson@edwardthomson.com> 1352094815 -0600 commit: trivial-4