diff options
Diffstat (limited to 'tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch')
-rw-r--r-- | tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch new file mode 100644 index 000000000..8e491ca68 --- /dev/null +++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101117 -0600 branch: Created from HEAD +596803b523203a4851c824c07366906f8353f4ad 8187117062b750eed4f93fd7e899f17b52ce554d Edward Thomson <ethomson@edwardthomson.com> 1352101132 -0600 commit: trivial-14-branch |