X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=525d3a1974d7b38a2f295c0b7c968fee92abdc43;hb=a2faed347de389d6f667a4e98576398db88d1a14;hp=84816a19e1cfcd7b6bb79cc078881b7a1bea6384;hpb=0cf336d2c95809ef41d94131e629fd1767f054a0;p=jquery.git

diff --git a/Makefile b/Makefile
index 84816a1..525d3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
 init:
-	@@if [ -d .git ]; then git submodule update --init --recursive; fi
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
 jquery: init ${JQ}
 jq: init ${JQ}