Merge branch 'fc/rerere-conflict-style'

diff --git a/git-instaweb.sh b/git-instaweb.sh
index e93a2386754342ce759b568fc360488119c09a2d..4aa3eb80fd25a803d291631965d009a49cfe79dc 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -5,6 +5,7 @@
 
 PERL='@@PERL@@'
 OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
 OPTIONS_SPEC="\
 git instaweb [options] (--start | --stop | --restart)
 --