Commit fcd1b786017471a7cbf97b1065a00f0551d47115
2016-05-02T14:46:14
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.