merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/checkout.h b/checkout.h
index 998071117952de27f2ec0c16d7b3d49abaa952bc..6b2073310c4a6a735a557ab0883c7bb045c2c458 100644 (file)
--- a/checkout.h
+++ b/checkout.h
@@ -8,6 +8,8 @@
  * tracking branch.  Return the name of the remote if such a branch
  * exists, NULL otherwise.
  */
-extern const char *unique_tracking_name(const char *name, struct object_id *oid);
+extern const char *unique_tracking_name(const char *name,
+                                       struct object_id *oid,
+                                       int *dwim_remotes_matched);
 
 #endif /* CHECKOUT_H */