Hash :
06f3aa5f
Author :
Date :
2017-12-23T10:07:44
Merge pull request #4429 from novalis/delete-modify-submodule-merge Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
| Git HTTP | https://git.kmx.io/thodg/libgit2.git |
|---|---|
| Git SSH | git@git.kmx.io:thodg/libgit2.git |
| Public access ? | public |
| Description | |
|
Users |
|
| Tags |
|
For information on the Clar testing framework and a detailed introduction please visit:
Write your modules and tests. Use good, meaningful names.
Make sure you actually build the tests by setting:
cmake -DBUILD_CLAR=ON build/
Test:
./build/libgit2_clar
Make sure everything is fine.
Send your pull request. That’s it.