Merge branch 'nd/corrupt-worktrees'

diff --git a/checkout.h b/checkout.h
index a6f5180436599541038c5e9d16d4768a2c7d9b39..1152133bd77a773f40afd6c3477224e051318e0c 100644 (file)
--- a/checkout.h
+++ b/checkout.h
@@ -9,7 +9,7 @@
  * exists, NULL otherwise.
  */
 const char *unique_tracking_name(const char *name,
-                                       struct object_id *oid,
-                                       int *dwim_remotes_matched);
+                                struct object_id *oid,
+                                int *dwim_remotes_matched);
 
 #endif /* CHECKOUT_H */