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/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 | |
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/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87')
-rw-r--r-- | tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 b/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 deleted file mode 100644 index 3091b8f3d..000000000 --- a/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU067d040031QH,-M-JOMLI+(aH:,:C: o>ZC'g$楧f&%%g5qYeZokM2ԐX\ZDPC~^ZNfrIf^:XZHي1O(_,'
jvn~JfZ&5`nלU7V.6t6L/R2I{| 2mg˾15ӿ,\})TC)0<vʉz֛9MՅ'6bN*
\ No newline at end of file |