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.

Author: pks-t

src/merge_file.c

@@ -134,8 +134,8 @@ static int merge_file__xdiff(
 
 	path = git_merge_file__best_path(
 		ancestor ? ancestor->path : NULL,
-		ours ? ours->path : NULL,
-		theirs ? theirs->path : NULL);
+		ours->path,
+		theirs->path);
 
 	if (path != NULL && (out->path = git__strdup(path)) == NULL) {
 		error = -1;
@@ -147,8 +147,8 @@ static int merge_file__xdiff(
 	out->len = mmbuffer.size;
 	out->mode = git_merge_file__best_mode(
 		ancestor ? ancestor->mode : 0,
-		ours ? ours->mode : 0,
-		theirs ? theirs->mode : 0);
+		ours->mode,
+		theirs->mode);
 
 done:
 	if (error < 0)