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/objects/e8/107f24196736b870a318a0e28f048e29f6feff | |
| 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/objects/e8/107f24196736b870a318a0e28f048e29f6feff')
| -rw-r--r-- | tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff b/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff deleted file mode 100644 index ffcf843c2..000000000 --- a/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff +++ /dev/null @@ -1,3 +0,0 @@ -xK!D]s -.i~=Lbo@dfE
UTj)kښ]om5(3j&4ppiRI;9Qg_j --RVȃ~ҙTI*tr g;9#Rmkb%rLN
\ No newline at end of file |