Merge branch 'pw/rebase-abort-clean-rewritten' into maint

diff --git a/merge-blobs.h b/merge-blobs.h
index 863a7e08071367a9dcf622095302f15744c8271c..13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65 100644 (file)
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -5,7 +5,7 @@ struct blob;
 struct index_state;
 
 void *merge_blobs(struct index_state *, const char *,
-                        struct blob *, struct blob *,
-                        struct blob *, unsigned long *);
+                 struct blob *, struct blob *,
+                 struct blob *, unsigned long *);
 
 #endif /* MERGE_BLOBS_H */