Merge branch 'cw/diff-highlight'

diff --git a/builtin.h b/builtin.h
index 7627483f2fe7aeffa3c17fb6e949df1fe85645b3..ec7e0954c4c8a1da896392bd28158abb74667898 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -111,7 +111,7 @@ struct fmt_merge_msg_opts {
 };
 
 int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
-                        struct fmt_merge_msg_opts *);
+                 struct fmt_merge_msg_opts *);
 
 /**
  * If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early
@@ -219,12 +219,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix);
 int cmd_revert(int argc, const char **argv, const char *prefix);
 int cmd_rm(int argc, const char **argv, const char *prefix);
 int cmd_send_pack(int argc, const char **argv, const char *prefix);
-int cmd_serve(int argc, const char **argv, const char *prefix);
 int cmd_shortlog(int argc, const char **argv, const char *prefix);
 int cmd_show(int argc, const char **argv, const char *prefix);
 int cmd_show_branch(int argc, const char **argv, const char *prefix);
 int cmd_show_index(int argc, const char **argv, const char *prefix);
 int cmd_status(int argc, const char **argv, const char *prefix);
+int cmd_stash(int argc, const char **argv, const char *prefix);
 int cmd_stripspace(int argc, const char **argv, const char *prefix);
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);