diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-01-17 23:31:24 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-02-13 11:44:34 -0500 |
| commit | 42f98a26a5da450b3ef8600b85711112dd9860f4 (patch) | |
| tree | 6f9a235e447ab3b846807c798996f23e27248d2f /src | |
| parent | 57f45e7f4dd7202607f51292a816a262622e964c (diff) | |
| download | libgit2-42f98a26a5da450b3ef8600b85711112dd9860f4.tar.gz | |
merge test: test an actual failure, not conflict
Correct the merge failed cleanup test. Merge data should not be
cleaned up on conflicts, only on actual failure. And ORIG_HEAD
should not be removed at all.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions