fix some stuff

docs/hg-howto.txt

@@ -21,6 +21,8 @@ default-push = https://username:password@fanboy-adblock-list.googlecode.com/hg/
 [ui]
 username = gmail-username@gmail.com
 verbose = true
+[extensions]
+rebase =
 
 (Note, use the googlecode password not the gmail password)
 Login to google/gmail first, then visit http://code.google.com/p/fanboy-adblock-list/source/list

script.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # Firefox
-hg pull
-hg merge
+hg pull --rebase
 hg update
 perl addChecksum.pl fanboy-adblocklist-adult.txt
 perl addChecksum.pl fanboy-adblocklist-current-expanded.txt
@@ -22,4 +21,4 @@ perl addChecksum-opera.pl iron/adblock-beta.ini
 # Now sync
 hg add .
 hg commit -m "$1"
-hg push -f
+hg push

winscript.bat

@@ -1,6 +1,5 @@
 @echo off
-hg pull
-hg merge
+hg pull --rebase
 hg update
 :: Firefox
 perl addChecksum.pl fanboy-adblocklist-adult.txt
@@ -23,4 +22,4 @@ perl addChecksum-opera.pl iron/adblock-beta.ini
 :: Now sync
 hg add .
 hg commit -m "%*"
-hg push -f
+hg push