diff hgext/rebase.py @ 7298:0e2e371c7406

kill some trailing spaces
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 01 Nov 2008 13:06:36 +0100
parents ddab62b2fec4
children 3e5db4228f8f
line wrap: on
line diff
--- 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