contrib/completion: add smerge to the mergetool completion candidates

diff --git a/remote.h b/remote.h
index 88f8480c71a2e5ac494ef65532619a4322c1d32a..da53ad570b91dbd4a820ffc79541fb0a4915ff6b 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -151,7 +151,6 @@ extern struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
                                    const struct string_list *server_options);
 
 int resolve_remote_symref(struct ref *ref, struct ref *list);
-int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);
 
 /*
  * Remove and free all but the first of any entries in the input list