diff options
| author | Vicent Marti <vicent@github.com> | 2014-07-23 09:41:52 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-07-23 09:41:52 +0200 |
| commit | 9de6ec52008e3f30a4e8a5c6a13859eefcf86f57 (patch) | |
| tree | 62d6be7b45f3ce7363f2802b5c3ff35e8ec0ca31 /src/array.h | |
| parent | 243db06ce3ab5ac984e24867815add6251819561 (diff) | |
| parent | 994404b5067f9cc35dfae2c460e209f30467c3b5 (diff) | |
| download | libgit2-9de6ec52008e3f30a4e8a5c6a13859eefcf86f57.tar.gz | |
Merge pull request #2477 from ethomson/merge
Don't allow conflicts by default
Diffstat (limited to 'src/array.h')
0 files changed, 0 insertions, 0 deletions