summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-12-23 23:44:58 -0600
committerEdward Thomson <ethomson@github.com>2016-03-17 11:02:27 -0400
commit59f293146503bf5e615161fe89c305f080755dd1 (patch)
treef0ec6e79463f43926208da19f9f2f4f17dc01090 /include/git2
parent3f04219fcdcbc6369270eaf2d878d4fe7064254d (diff)
downloadlibgit2-59f293146503bf5e615161fe89c305f080755dd1.tar.gz
merge driver: test GIT_PASSTHROUGH
When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`, move on to the default merge driver.
Diffstat (limited to 'include/git2')
0 files changed, 0 insertions, 0 deletions