Merge branch 'en/merge-options-ff-and-friends'

diff --git a/quote.h b/quote.h
index 86c0d944b57745e50c365ab715c6082ed7c37224..fb08dc085cca25c276cebd79a4cac5b81bd6ad9a 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -68,7 +68,7 @@ void quote_two_c_style(struct strbuf *, const char *, const char *, int);
 
 void write_name_quoted(const char *name, FILE *, int terminator);
 void write_name_quoted_relative(const char *name, const char *prefix,
-               FILE *fp, int terminator);
+                               FILE *fp, int terminator);
 
 /* quote path as relative to the given prefix */
 char *quote_path_relative(const char *in, const char *prefix,