diff options
| author | Carlos Martín Nieto <carlosmn@github.com> | 2016-03-17 18:01:37 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-03-17 18:01:37 +0100 |
| commit | e18df18bea14e17f648209b733359564a5836d8a (patch) | |
| tree | a0dc5b65ab27376cab6a2edc8f3700823c37543a /tests/object/tree/attributes.c | |
| parent | e02acbb3c6076cc9acbcf8de7a258eee406b2921 (diff) | |
| parent | d953c4505e09756b4b4f72b431a51867281643ca (diff) | |
| download | libgit2-e18df18bea14e17f648209b733359564a5836d8a.tar.gz | |
Merge pull request #3564 from ethomson/merge_drivers
Custom merge drivers and proper gitattributes `merge` handling
Diffstat (limited to 'tests/object/tree/attributes.c')
0 files changed, 0 insertions, 0 deletions