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/modules/submodule/objects | |
| 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/modules/submodule/objects')
9 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e b/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e Binary files differnew file mode 100644 index 000000000..fcf1c6381 --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d b/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d Binary files differnew file mode 100644 index 000000000..aa9fc5006 --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 Binary files differnew file mode 100644 index 000000000..bc9a32ebc --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 b/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 Binary files differnew file mode 100644 index 000000000..65a8d759f --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc b/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc Binary files differnew file mode 100644 index 000000000..49e1aafeb --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 new file mode 100644 index 000000000..6ceffdd4e --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 @@ -0,0 +1,2 @@ +x
!@=S
hf%x! ]k/{k-a]
xWs =,lP +#g0KIC ,51 9;alB=>|h}_{{Me?u6">:叄ʃ6^Kd
\ No newline at end of file diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 b/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 Binary files differnew file mode 100644 index 000000000..14781032f --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932 b/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932 new file mode 100644 index 000000000..8df72a45c --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932 @@ -0,0 +1,3 @@ +xA +0E]semDx$҂@gpQs^+ZD[a +,c GsBO# vhGpIZ4U{^c]zo@ǎ\M-\ <Bt流A
\ No newline at end of file diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b b/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b Binary files differnew file mode 100644 index 000000000..e0d73e1c2 --- /dev/null +++ b/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b |