diff options
| author | Patrick Steinhardt <ps@pks.im> | 2016-05-02 14:46:14 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2016-05-02 17:45:23 +0200 |
| commit | fcd1b786017471a7cbf97b1065a00f0551d47115 (patch) | |
| tree | bc78ab9fa039709487ad332b8d13b5556e74b2ed /tests/diff/diffiter.c | |
| parent | f80852af807ae40bfc56e3285dda460873ecc9f9 (diff) | |
| download | libgit2-fcd1b786017471a7cbf97b1065a00f0551d47115.tar.gz | |
merge_file: do not unnecessarily check ours/theirs for NULL
The `merge_file__xdiff` function checks if either `ours` or
`theirs` is `NULL`. The function is to be called with existing
files, though, and in fact already unconditionally dereferences
both pointers.
Remove the unnecessary check to silence warnings.
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions