diff options
author | Robert Coup <robert@coup.net.nz> | 2019-03-19 23:43:56 +1300 |
---|---|---|
committer | Robert Coup <robert@coup.net.nz> | 2019-06-10 11:22:02 +0100 |
commit | 1d04f477e5c3c83b6c3985df21fa5fbec600f302 (patch) | |
tree | b7d787989254fc058e07388c3e9993b398d6cbd0 /tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch | |
parent | 6d2ab2cfe9b11f841141fc1bcc84fdd2009092fc (diff) | |
download | libgit2-1d04f477e5c3c83b6c3985df21fa5fbec600f302.tar.gz |
merge: tests for bare repo merge analysis
dupe of workdir/analysis.c against a bare repo.
Diffstat (limited to 'tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch')
-rw-r--r-- | tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch new file mode 100644 index 000000000..22331d78c --- /dev/null +++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099799 -0600 branch: Created from HEAD +092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson <ethomson@edwardthomson.com> 1352099812 -0600 commit: trivial-7-branch +73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099874 -0600 reset: moving to 092ce8682d7f3a2a3a769a6daca58950168ba5c4 +092ce8682d7f3a2a3a769a6daca58950168ba5c4 009b9cab6fdac02915a88ecd078b7a792ed802d8 Edward Thomson <ethomson@edwardthomson.com> 1352099921 -0600 commit: removed in 7 +009b9cab6fdac02915a88ecd078b7a792ed802d8 5195a1b480f66691b667f10a9e41e70115a78351 Edward Thomson <ethomson@edwardthomson.com> 1352099927 -0600 commit (amend): trivial-7-branch |