--- a/hgext/rebase.py Thu Oct 30 12:38:24 2008 -0700
+++ b/hgext/rebase.py Sat Nov 01 13:06:36 2008 +0100
@@ -23,7 +23,7 @@
def rebasemerge(repo, rev, first=False):
'return the correct ancestor'
oldancestor = ancestor.ancestor
-
+
def newancestor(a, b, pfunc):
ancestor.ancestor = oldancestor
anc = ancestor.ancestor(a, b, pfunc)
@@ -172,9 +172,9 @@
p1, p2 = defineparents(repo, rev, target, state, targetancestors)
- repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
+ repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
repo[p2].rev()))
-
+
# Merge phase
if len(repo.parents()) != 2:
# Update to target and merge it with local
--- a/mercurial/help.py Thu Oct 30 12:38:24 2008 -0700
+++ b/mercurial/help.py Sat Nov 01 13:06:36 2008 +0100
@@ -231,7 +231,7 @@
In building Mercurial, we made a choice to support the git diff
format, but we haven't made it the default. This is because for a
- long time, the format for unified diffs we usually use has been
+ long time, the format for unified diffs we usually use has been
defined by GNU patch, and it doesn't (yet) support git's extensions
to the diff format. This means that, when extracting diffs from a
Mercurial repository (through the diff command, for example), you