Merge branch 'fc/rerere-conflict-style'

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 8e17525dd86aa614000d9b335f9671a829678901..167d79fea809b918e81c2228ee27baa5fab23db4 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
 OPTIONS_SPEC="\
 git quiltimport [options]
 --