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/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 | |
| 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/ae/39c77c70cb6bad18bb471912460c4e1ba0f586')
| -rw-r--r-- | tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 | 2 |
1 files changed, 2 insertions, 0 deletions
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 |