summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch')
-rw-r--r--tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch
new file mode 100644
index 000000000..1b126fb7b
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100310 -0600 branch: Created from HEAD
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e 13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e Edward Thomson <ethomson@edwardthomson.com> 1352100317 -0600 commit: trivial-9-branch