diff --git a/contrib/bash_completion b/contrib/bash_completion
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -28,7 +28,7 @@
 #              cat ~/.patchbomb-$1
 #          fi
 #      }
-# 
+#
 #
 # Writing completion functions for additional commands:
 #
@@ -50,7 +50,7 @@
 #                  an argument (e.g. '--cwd|-R|--repository')
 # - $canonical - 1 if we canonicalized $cmd before calling the function
 #                0 otherwise
-# 
+#
 
 shopt -s extglob
 
@@ -425,7 +425,7 @@ complete -o bashdefault -o default -F _h
     done
 
     if [ -z "$subcmd" ] || [ $COMP_CWORD -eq $i ] || [ "$subcmd" = help ]; then
-	COMPREPLY=(${COMPREPLY[@]:-} 
+	COMPREPLY=(${COMPREPLY[@]:-}
 		   $(compgen -W 'bad good help init next reset' -- "$cur"))
 	return
     fi
@@ -445,7 +445,7 @@ complete -o bashdefault -o default -F _h
 {
     case "$prev" in
 	-c|--cc|-t|--to|-f|--from|--bcc)
-	    # we need an e-mail address. let the user provide a function 
+	    # we need an e-mail address. let the user provide a function
 	    # to get them
 	    if [ "$(type -t _hg_emails)" = function ]; then
 		local arg=to
diff --git a/contrib/hgdiff b/contrib/hgdiff
--- a/contrib/hgdiff
+++ b/contrib/hgdiff
@@ -15,7 +15,7 @@ parser.add_option("-d", "--difflib", act
 parser.add_option('-x', '--count', default=1)
 parser.add_option('-c', '--context', type="int", default=3)
 parser.add_option('-p', '--show-c-function', action="store_true", default=False)
-parser.add_option('-w', '--ignore-all-space', action="store_true", 
+parser.add_option('-w', '--ignore-all-space', action="store_true",
                   default=False)
 
 (options, args) = parser.parse_args()
diff --git a/contrib/hgsh/hgsh.c b/contrib/hgsh/hgsh.c
--- a/contrib/hgsh/hgsh.c
+++ b/contrib/hgsh/hgsh.c
@@ -249,7 +249,7 @@ enum cmdline {
     hg_serve,
 };
 
-    
+
 /*
  * attempt to verify that a directory is really a hg repo, by testing
  * for the existence of a subdirectory.
@@ -342,13 +342,13 @@ static void serve_data(int argc, char **
 
 	if (cmd != hg_init) {
 	    int valid;
-	    
+
 	    valid = validate_repo(repo_root, "data");
 
 	    if (valid == -1) {
 		goto badargs;
 	    }
-	    
+
 	    if (valid == 0) {
 		valid = validate_repo(repo_root, "store");
 
@@ -356,7 +356,7 @@ static void serve_data(int argc, char **
 		    goto badargs;
 		}
 	    }
-	    
+
 	    if (valid == 0) {
 		perror(repo);
 		exit(EX_DATAERR);
@@ -385,7 +385,7 @@ static void serve_data(int argc, char **
 	nargv[i++] = repo;
 	break;
     }
-    
+
     nargv[i] = NULL;
 
     if (debug) {
diff --git a/contrib/mercurial.el b/contrib/mercurial.el
--- a/contrib/mercurial.el
+++ b/contrib/mercurial.el
@@ -426,7 +426,7 @@ Handle frickin' frackin' gratuitous even
     (if (or (not default) current-prefix-arg)
         (string-to-number
          (eval (list* 'read-string
-                      (or prompt "") 
+                      (or prompt "")
                       (if default (cons (format "%d" default) nil) nil))))
       default)))
 
@@ -565,7 +565,7 @@ directory names from the file system.  W
 	  (when buf
 	    (set-buffer buf)
 	    (hg-mode-line-internal status parents)))))))
-  
+
 
 ;;; View mode bits.
 
@@ -588,7 +588,7 @@ current frame."
   (setq hg-view-mode t)
   (setq truncate-lines t)
   (when file-name
-    (setq hg-view-file-name 
+    (setq hg-view-file-name
 	  (hg-abbrev-file-name file-name))))
 
 (defun hg-file-status (file)
@@ -703,7 +703,7 @@ Always returns a valid, hopefully sane, 
 						 (added . "a")
 						 (deleted . "!")
 						 (modified . "m"))))))))
-  
+
 (defun hg-mode-line (&optional force)
   "Update the modeline with the current status of a file.
 An update occurs if optional argument FORCE is non-nil,
@@ -1000,7 +1000,7 @@ With a prefix argument, prompt for all o
         ;; none revision is specified explicitly
         (none (and (not rev1) (not rev2)))
         ;; only one revision is specified explicitly
-        (one (or (and (or (equal rev1 rev2) (not rev2)) rev1) 
+        (one (or (and (or (equal rev1 rev2) (not rev2)) rev1)
                  (and (not rev1) rev2)))
 	diff)
     (hg-view-output ((cond
@@ -1012,7 +1012,7 @@ With a prefix argument, prompt for all o
 		       (format "Mercurial: Diff from rev %s to %s of %s"
 			       rev1 rev2 a-path))))
       (cond
-       (none 
+       (none
         (call-process (hg-binary) nil t nil "diff" path))
        (one
         (call-process (hg-binary) nil t nil "diff" "-r" one path))
@@ -1100,7 +1100,7 @@ With a prefix argument, prompt for each 
         (limit (format "%d" (or log-limit hg-log-limit))))
     (hg-view-output ((if (equal r1 r2)
                          (format "Mercurial: Log of rev %s of %s" rev1 a-path)
-                       (format 
+                       (format
                         "Mercurial: at most %s log(s) from rev %s to %s of %s"
                         limit r1 r2 a-path)))
       (eval (list* 'call-process (hg-binary) nil t nil
@@ -1123,7 +1123,7 @@ With a prefix argument, prompt for each 
   (interactive (list (hg-read-file-name " to log")
                      (hg-read-rev " to start with"
                                   "tip")
-                     (hg-read-rev " to end with" 
+                     (hg-read-rev " to end with"
 				  "0")
                      (hg-read-number "Output limited to: "
                                      hg-log-limit)))
diff --git a/contrib/mq.el b/contrib/mq.el
--- a/contrib/mq.el
+++ b/contrib/mq.el
@@ -131,7 +131,7 @@ May return nil, meaning \"use the defaul
     (let ((line (buffer-substring bol (point))))
       (when (> (length line) 0)
 	line))))
-  
+
 (defun mq-push (&optional patch)
   "Push patches until PATCH is reached.
 If PATCH is nil, push at most one patch."
@@ -166,7 +166,7 @@ If PATCH is nil, push at most one patch.
       (if ok
 	  (message "Pushing... %s" last-line)
 	(error "Pushing... %s" last-line)))))
-  
+
 (defun mq-push-all ()
   "Push patches until all are applied."
   (interactive)
@@ -195,7 +195,7 @@ If PATCH is nil, pop at most one patch."
       (if ok
 	  (message "Popping... %s" last-line)
 	(error "Popping... %s" last-line)))))
-  
+
 (defun mq-pop-all ()
   "Push patches until none are applied."
   (interactive)
@@ -255,7 +255,7 @@ This would become the active patch if po
   (let ((buf mq-prev-buffer))
     (kill-buffer nil)
     (switch-to-buffer buf)))
-  
+
 (defun mq-edit-kill ()
   "Kill the edit currently being prepared."
   (interactive)
@@ -316,7 +316,7 @@ Key bindings
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (run-hooks 'text-mode-hook 'mq-edit-mode-hook))
-  
+
 (defun mq-refresh-edit ()
   "Refresh the topmost applied patch, editing the patch description."
   (interactive)
diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -28,7 +28,7 @@ from mercurial.i18n import _
 
 class CantReprocessAndShowBase(Exception):
     pass
-    
+
 
 def warn(message):
     sys.stdout.flush()
@@ -50,7 +50,7 @@ def intersect(ra, rb):
     """
     assert ra[0] <= ra[1]
     assert rb[0] <= rb[1]
-    
+
     sa = max(ra[0], rb[0])
     sb = min(ra[1], rb[1])
     if sa < sb:
@@ -69,7 +69,7 @@ def compare_range(a, astart, aend, b, bs
             return False
     else:
         return True
-        
+
 
 
 
@@ -149,15 +149,15 @@ class Merge3Text(object):
                 yield end_marker + newline
             else:
                 raise ValueError(what)
-        
-        
+
+
 
 
 
     def merge_annotated(self):
         """Return merge with conflicts, showing origin of lines.
 
-        Most useful for debugging merge.        
+        Most useful for debugging merge.
         """
         for t in self.merge_regions():
             what = t[0]
@@ -180,8 +180,8 @@ class Merge3Text(object):
                 yield '>>>>\n'
             else:
                 raise ValueError(what)
-        
-        
+
+
 
 
 
@@ -249,15 +249,15 @@ class Merge3Text(object):
 
         # section a[0:ia] has been disposed of, etc
         iz = ia = ib = 0
-        
+
         for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
             #print 'match base [%d:%d]' % (zmatch, zend)
-            
+
             matchlen = zend - zmatch
             assert matchlen >= 0
             assert matchlen == (aend - amatch)
             assert matchlen == (bend - bmatch)
-            
+
             len_a = amatch - ia
             len_b = bmatch - ib
             len_base = zmatch - iz
@@ -294,22 +294,22 @@ class Merge3Text(object):
             # if the same part of the base was deleted on both sides
             # that's OK, we can just skip it.
 
-                
+
             if matchlen > 0:
                 assert ia == amatch
                 assert ib == bmatch
                 assert iz == zmatch
-                
+
                 yield 'unchanged', zmatch, zend
                 iz = zend
                 ia = aend
                 ib = bend
-    
+
 
     def reprocess_merge_regions(self, merge_regions):
         """Where there are conflict regions, remove the agreed lines.
 
-        Lines where both A and B have made the same changes are 
+        Lines where both A and B have made the same changes are
         eliminated.
         """
         for region in merge_regions:
@@ -342,7 +342,7 @@ class Merge3Text(object):
         if next_a < region_ia or next_b < region_ib:
             return 'conflict', None, None, next_a, region_ia, next_b, region_ib
     mismatch_region = staticmethod(mismatch_region)
-            
+
 
     def find_sync_regions(self):
         """Return a list of sync regions, where both descendents match the base.
@@ -397,7 +397,7 @@ class Merge3Text(object):
                 ia += 1
             else:
                 ib += 1
-            
+
         intbase = len(self.base)
         abase = len(self.a)
         bbase = len(self.b)
@@ -429,7 +429,7 @@ class Merge3Text(object):
                 del am[0]
             else:
                 del bm[0]
-                
+
         return unc
 
 
@@ -511,9 +511,9 @@ options = [('L', 'label', [], _('labels 
 usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
 
     Simple three-way file merge utility with a minimal feature set.
-    
+
     Apply to LOCAL the changes necessary to go from BASE to OTHER.
-    
+
     By default, LOCAL is overwritten with the results of this operation.
 ''')
 
diff --git a/contrib/vim/hg-menu.vim b/contrib/vim/hg-menu.vim
--- a/contrib/vim/hg-menu.vim
+++ b/contrib/vim/hg-menu.vim
@@ -9,7 +9,7 @@
 "         Usage: These command and gui menu displays useful hg functions
 " Configuration: Your hg executable must be in your path.
 " =============================================================================
- 
+
 " Section: Init {{{1
 if exists("loaded_hg_menu")
   finish
diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Mercurial for Windows</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >  
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
     <style type="text/css">
       <!--
       .indented
@@ -21,7 +21,7 @@
     <p>Mercurial is a command-line application.  You must run it from
       the Windows command prompt (or if you're hard core, a <a
       href="http://www.mingw.org/">MinGW</a> shell).</p>
-    
+
     <p><div class="indented"><i>Note: the standard <a
       href="http://www.mingw.org/">MinGW</a> msys startup script uses
       rxvt which has problems setting up standard input and output.
@@ -59,10 +59,10 @@ editor = whatever
 </pre>
 
 	<h4>Configuring a Merge program</h4>
-	It should be emphasized that Mercurial by itself doesn't attempt to do a 
+	It should be emphasized that Mercurial by itself doesn't attempt to do a
 	Merge at the file level, neither does it make any attempt to Resolve the conflicts.
 
-    By default, Mercurial will use the merge program defined by the HGMERGE environment 
+    By default, Mercurial will use the merge program defined by the HGMERGE environment
     variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information)
 
     <h1>Reporting problems</h1>
diff --git a/contrib/win32/mercurial.ini b/contrib/win32/mercurial.ini
--- a/contrib/win32/mercurial.ini
+++ b/contrib/win32/mercurial.ini
@@ -3,7 +3,7 @@
 ; USERNAME is your Windows user name:
 ;   C:\Documents and Settings\USERNAME\Mercurial.ini
 
-[ui] 
+[ui]
 editor = notepad
 
 ; By default, we try to encode and decode all files that do not
diff --git a/contrib/win32/win32-build.txt b/contrib/win32/win32-build.txt
--- a/contrib/win32/win32-build.txt
+++ b/contrib/win32/win32-build.txt
@@ -35,7 +35,7 @@ C:\hg\hg-release.
 
 In a shell, build a standalone copy of the hg.exe program:
 
-  python setup.py build -c mingw32 
+  python setup.py build -c mingw32
   python setup.py py2exe -b 1
 
 Note: the previously suggested combined command of "python setup.py build -c
diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -137,17 +137,17 @@ decode/encode::
     **.txt = tempfile: unix2dos -n INFILE OUTFILE
 
 defaults::
-  Use the [defaults] section to define command defaults, i.e. the 
+  Use the [defaults] section to define command defaults, i.e. the
   default options/arguments to pass to the specified commands.
-  
+
   The following example makes 'hg log' run in verbose mode, and
   'hg status' show only the modified files, by default.
-  
+
     [defaults]
     log = -v
     status = -m
-  
-  The actual commands, instead of their aliases, must be used when 
+
+  The actual commands, instead of their aliases, must be used when
   defining command defaults. The command defaults will also be
   applied to the aliases of the commands defined.
 
diff --git a/doc/ja/docbook.ja.conf b/doc/ja/docbook.ja.conf
--- a/doc/ja/docbook.ja.conf
+++ b/doc/ja/docbook.ja.conf
@@ -481,7 +481,7 @@ template::[header-declarations]
 </book>
 
 [preamble]
-# Preamble is not allowed in DocBook book so wrap it in a preface. 
+# Preamble is not allowed in DocBook book so wrap it in a preface.
 <preface{id? id="{id}"}>
 <title>Preface</title>
 |
diff --git a/doc/ja/hg.1.ja.txt b/doc/ja/hg.1.ja.txt
--- a/doc/ja/hg.1.ja.txt
+++ b/doc/ja/hg.1.ja.txt
@@ -219,7 +219,7 @@ copy <source ...> <dest>::
     -f, --force           既存の変更されたファイルに無理矢理コピー
                           します
     -p, --parents         コピー先にコピー元のパスを追加します
-    
+
     別名: cp
 
 diff [-a] [-r revision] [-r revision] [files ...]::
@@ -388,7 +388,7 @@ locate [options] [files]::
 
     オプション:
 
-    -0, --print0         xargs と一緒に使うために、ファイル名を 
+    -0, --print0         xargs と一緒に使うために、ファイル名を
                          NUL で終えます
     -f, --fullpath       ファイルシステムのルートからの完全なパ
                          スを表示します
@@ -580,9 +580,9 @@ serve [options]::
     -E, --errorlog <file>    エラーログが出力されるファイルの名前を
                              指定します
     -a, --address <addr>     使用するアドレスを指定します
-    -p, --port <n>           使用するポートを指定します 
+    -p, --port <n>           使用するポートを指定します
                              (デフォルト: 8000)
-    -n, --name <name>        ウェブページで表示する名前を指定します 
+    -n, --name <name>        ウェブページで表示する名前を指定します
                              (デフォルト: working dir)
     -t, --templatedir <path> 使用するウェブの雛型を指定します
     -6, --ipv6               IPv4 に加えて IPv6 も使用します
diff --git a/doc/ja/hgrc.5.ja.txt b/doc/ja/hgrc.5.ja.txt
--- a/doc/ja/hgrc.5.ja.txt
+++ b/doc/ja/hgrc.5.ja.txt
@@ -61,7 +61,7 @@ Mercurial は 3つのファイルから設定を読みます:
 クションのそれぞれの目的や可能なキー、そして取り得る値について記述
 します。
 
-decode/encode:: 
+decode/encode::
   checkout/checkin でファイルを転送するときのフィルターです。これ
   は典型的には改行を処理したり、他の地域化/標準化に使われるでしょ
   う。
@@ -98,7 +98,7 @@ http_proxy::
   HTTP プロキシを通してウェブを使った Mercurial のリポジトリにアク
   セスするのに使われます。
   host;;
-    プロキシサーバのホスト名と(オプションの)ポートで、例えば 
+    プロキシサーバのホスト名と(オプションの)ポートで、例えば
     "myproxy:8000"などです。
   no;;
     オプションです。コンマで区切られたプロキシを通過すべきホスト名
diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -31,7 +31,7 @@ from mercurial import hg, util
 from mercurial.i18n import _
 import os
 
-def dopurge(ui, repo, dirs=None, act=True, ignored=False, 
+def dopurge(ui, repo, dirs=None, act=True, ignored=False,
             abort_on_err=False, eol='\n',
             force=False, include=None, exclude=None):
     def error(msg):
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -124,7 +124,7 @@ class localrepository(repo.repository):
             fp.write('%s %s\n' % (hex(node), munge and munge(name) or name))
             fp.close()
             self.hook('tag', node=hex(node), tag=name, local=local)
-            
+
         prevtags = ''
         if local:
             try:
diff --git a/tests/hghave b/tests/hghave
--- a/tests/hghave
+++ b/tests/hghave
@@ -55,7 +55,7 @@ if __name__ == '__main__':
     if options.list_features:
         list_features()
         sys.exit(0)
-        
+
     quiet = options.quiet
 
     failures = 0
@@ -65,17 +65,17 @@ if __name__ == '__main__':
         if not quiet:
             sys.stderr.write(msg + '\n')
         failures += 1
-    
+
     for feature in args:
         if feature not in checks:
             error('hghave: unknown feature: ' + feature)
             continue
-        
-        check, desc = checks[feature]       
+
+        check, desc = checks[feature]
         if not check():
             error('hghave: missing feature: ' + desc)
 
     if failures != 0:
         sys.exit(1)
 
-    
+
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -322,7 +322,7 @@ def run_one(test):
     elif diffret:
         ret = diffret
 
-    if ret != 0 and not skipped: 
+    if ret != 0 and not skipped:
         # Save errors to a file for diagnosis
         f = open(err, "wb")
         for line in out:
diff --git a/tests/test-simplemerge-cmd.out b/tests/test-simplemerge-cmd.out
index 8141eb588a69a7b55ec50be707781ceb376ad3dc..b46c9e5892d59141508c642a79ff6e01b14e80f2
GIT binary patch
literal 2557
zc%1E(O^?$s5QaJDSIi|hvJxCCK<c8EI8-X4dqW(Yc#>FkY_C0`8-6`wJK1(WV9SA9
zeM-mk@r>uSTSC(d(<#$|wvEsrmB)tkR1D}lgfKP@qC{Dw?V=U|3rjuvq6Fuap%_XQ
z0!cg4bFZ9sb-GbPV@<17Lm?YJ<n>^#va_)SImySo=9HiEI=W{w8d)5KHw?5oRscEr
zh?v^Bn!9R+(%e!BRb^~7D5Hi2?p2mp<}pvS{DJ9Jo)X@H7BxPp-dg)#+AraKE*Jj2
zUM<cpLe|0{%(T=Jwe`dS!hkh;g5a=G?F4kNvrCMsl@We|mS?j>WK*62E6MHyXthTW
zr_N7ed8mZ<bmTlU$(t7x-lKL!P=nK$mGgc3^>+6IHrvnZ4P38xH?Y0^a`UYyfY&ZL
z0`(rTI*1u32acq)q6rR)dagWc4q6m6dcJ2!S2@YrIX)r2QMm?#<SU8+3^o`-B<AhT
zLhJ32A^3OVm~&iDAh8vrrnhq%6~O*PfAES3O{R#cJqGsT&6a;gCx>2;vW7ER7eB(P
zfNH~sng#`V<)Ov0V?dtigBEz~evdwIjF<;8hX8r*6@=F5SON%+k8^^`v1fWqX3zY+
zpeYjwg^Y+x3sG#Tuhi}7B?gcdqLL|}QZlPwcm(v=#jdz)&yjJ!3!qfNX`WiL2_pgT
zRm8hvzq?W4f)_^T7>*BXB*$-F2?uYP$c#gcK5`1*jRP8f-%hl%I?wGQv5UlBkXRk@
e(rG=`RJL(AKjDdr|GsT!m`7ezby3w{RrMQW=t>y?