summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/logs/refs/heads/octo3
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/logs/refs/heads/octo3')
-rw-r--r--tests/resources/merge-resolve.git/logs/refs/heads/octo32
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo3 b/tests/resources/merge-resolve.git/logs/refs/heads/octo3
deleted file mode 100644
index 7db5617c8..000000000
--- a/tests/resources/merge-resolve.git/logs/refs/heads/octo3
+++ /dev/null
@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874980 -0500 branch: Created from HEAD
-977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson <ethomson@edwardthomson.com> 1351874998 -0500 commit: octo3