diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-23 14:08:20 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-23 14:08:20 +0200 |
| commit | 0c34fa5094ba624ebe398d1b154fd27c207108cb (patch) | |
| tree | a8fde7d90bac3c3c578534c54a5c01da65019286 /tests/diff/diff_helpers.c | |
| parent | 91c1833af1bdc0680b42e9f2934665330f826c18 (diff) | |
| parent | cb63e7e8971134e41e99a7010d9b2ad54e6639ff (diff) | |
| download | libgit2-0c34fa5094ba624ebe398d1b154fd27c207108cb.tar.gz | |
Merge pull request #3228 from git-up/diff_merge
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
Diffstat (limited to 'tests/diff/diff_helpers.c')
0 files changed, 0 insertions, 0 deletions