Merge branch 'js/fmt-patch' into next

diff --git a/Makefile b/Makefile
index ecbdde6ef973b9668b83bff85c9abe92dcc29fd9..e9d9e101d393dd037728fa4552d8b9fc03270557 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,8 +215,8 @@ LIB_OBJS = \
        $(DIFF_OBJS)
 
 BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
-       builtin-push.o builtin-grep.o
+       builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
+       builtin-grep.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz