summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive/.gitted/objects/de
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-07-01 13:46:59 +0100
committerEdward Thomson <ethomson@edwardthomson.com>2018-11-05 15:53:34 +0000
commit3b674660fe3f7c05359110007099ddf051caca7d (patch)
tree8551988c453c93bf148370d0f590470f4b50130c /tests/resources/merge-recursive/.gitted/objects/de
parent5b8d5a22e702e4862ebfc56e37d18ca11bfebf02 (diff)
downloadlibgit2-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/merge-recursive/.gitted/objects/de')
0 files changed, 0 insertions, 0 deletions