diff options
author | Edward Thomson <ethomson@microsoft.com> | 2013-04-01 22:16:21 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-04-30 15:31:31 -0500 |
commit | bec65a5e994bc4701216c9ca2c7dae83770b3edc (patch) | |
tree | 1e941e76b80245dcfb4853d7c6dc231c7aab7699 /tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3 | |
parent | 5e2261aca86310aa180eab5ccdc345b1539b024d (diff) | |
download | libgit2-bec65a5e994bc4701216c9ca2c7dae83770b3edc.tar.gz |
merge!
Diffstat (limited to 'tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3')
-rw-r--r-- | tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3 b/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3 new file mode 100644 index 000000000..7db5617c8 --- /dev/null +++ b/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/octo3 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874980 -0500 branch: Created from HEAD +977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson <ethomson@edwardthomson.com> 1351874998 -0500 commit: octo3 |