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