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/trivial-5alt-1 | |
| parent | 5e2261aca86310aa180eab5ccdc345b1539b024d (diff) | |
| download | libgit2-bec65a5e994bc4701216c9ca2c7dae83770b3edc.tar.gz | |
merge!
Diffstat (limited to 'tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1')
| -rw-r--r-- | tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 b/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 new file mode 100644 index 000000000..14497029a --- /dev/null +++ b/tests-clar/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096606 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec +c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson <ethomson@edwardthomson.com> 1352096643 -0600 commit: 5alt-1 |