Merge branch 'am/p4-branches-excludes'

diff --git a/bulk-checkin.h b/bulk-checkin.h
index bf830e780de6e6a0fc0480cd65d3e5a5eb58a599..b26f3dc3b74cb9ccb4ea630fafe8cd0cdcf5a012 100644 (file)
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -7,8 +7,8 @@
 #include "cache.h"
 
 int index_bulk_checkin(struct object_id *oid,
-                             int fd, size_t size, enum object_type type,
-                             const char *path, unsigned flags);
+                      int fd, size_t size, enum object_type type,
+                      const char *path, unsigned flags);
 
 void plug_bulk_checkin(void);
 void unplug_bulk_checkin(void);