diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-07-01 13:46:59 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-11-05 15:53:34 +0000 |
| commit | 3b674660fe3f7c05359110007099ddf051caca7d (patch) | |
| tree | 8551988c453c93bf148370d0f590470f4b50130c /tests/resources | |
| parent | 5b8d5a22e702e4862ebfc56e37d18ca11bfebf02 (diff) | |
| download | libgit2-3b674660fe3f7c05359110007099ddf051caca7d.tar.gz | |
apply tests: ensure we can patch a modified file
Patch application need not be on an unmodified file; applying to an
already changed file is supported provided the patch still applies
cleanly. Add tests that modifies the contents of a file then applies
the patch and ensures that the patch applies cleanly, and the original
changes are also kept.
Diffstat (limited to 'tests/resources')
| -rw-r--r-- | tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 | bin | 0 -> 375 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 b/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 Binary files differnew file mode 100644 index 000000000..b3919aab6 --- /dev/null +++ b/tests/resources/merge-recursive/.gitted/objects/06/d3fefb8726ab1099acc76e02dfb85e034b2538 |