Merge branch 'sw/git-p4-unshelve-branched-files'

diff --git a/upload-pack.h b/upload-pack.h
index bc2ceb211c48cec284fdedca17f2bf2b493ed895..4bafe16a22c37d3eac65690cc6f1cc68476cf94c 100644 (file)
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -14,10 +14,10 @@ struct repository;
 struct argv_array;
 struct packet_reader;
 int upload_pack_v2(struct repository *r, struct argv_array *keys,
-                         struct packet_reader *request);
+                  struct packet_reader *request);
 
 struct strbuf;
 int upload_pack_advertise(struct repository *r,
-                                struct strbuf *value);
+                         struct strbuf *value);
 
 #endif /* UPLOAD_PACK_H */