diff options
| author | Robert Coup <robert@coup.net.nz> | 2019-06-06 16:32:09 +0100 |
|---|---|---|
| committer | Robert Coup <robert@coup.net.nz> | 2019-06-10 11:22:02 +0100 |
| commit | 7b27b6cf716429080fbc968d8f573977996ee112 (patch) | |
| tree | ecba96301a4d62376a849a98aea28b2d8327cd9b /tests/resources/merge-resolve.git/refs/heads/trivial-9-branch | |
| parent | 5427461fb47d22760c0a5a80b6a5f33561e48820 (diff) | |
| download | libgit2-7b27b6cf716429080fbc968d8f573977996ee112.tar.gz | |
Refactor testing:
- move duplication between merge/trees/ and merge/workdir/ into merge/analysis{.c,.h}
- remove merge-resolve.git resource, open the existing merge-resolve as a bare repo instead.
Diffstat (limited to 'tests/resources/merge-resolve.git/refs/heads/trivial-9-branch')
| -rw-r--r-- | tests/resources/merge-resolve.git/refs/heads/trivial-9-branch | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch deleted file mode 100644 index 7f3097b69..000000000 --- a/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch +++ /dev/null @@ -1 +0,0 @@ -13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e |