##// END OF EJS Templates
kill some trailing spaces
Dirkjan Ochtman -
r7298:0e2e371c default
parent child Browse files
Show More
@@ -23,7 +23,7 b' import os, errno'
23 def rebasemerge(repo, rev, first=False):
23 def rebasemerge(repo, rev, first=False):
24 'return the correct ancestor'
24 'return the correct ancestor'
25 oldancestor = ancestor.ancestor
25 oldancestor = ancestor.ancestor
26
26
27 def newancestor(a, b, pfunc):
27 def newancestor(a, b, pfunc):
28 ancestor.ancestor = oldancestor
28 ancestor.ancestor = oldancestor
29 anc = ancestor.ancestor(a, b, pfunc)
29 anc = ancestor.ancestor(a, b, pfunc)
@@ -172,9 +172,9 b' def rebasenode(repo, rev, target, state,'
172
172
173 p1, p2 = defineparents(repo, rev, target, state, targetancestors)
173 p1, p2 = defineparents(repo, rev, target, state, targetancestors)
174
174
175 repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
175 repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
176 repo[p2].rev()))
176 repo[p2].rev()))
177
177
178 # Merge phase
178 # Merge phase
179 if len(repo.parents()) != 2:
179 if len(repo.parents()) != 2:
180 # Update to target and merge it with local
180 # Update to target and merge it with local
@@ -231,7 +231,7 b' PYTHONPATH::'
231
231
232 In building Mercurial, we made a choice to support the git diff
232 In building Mercurial, we made a choice to support the git diff
233 format, but we haven't made it the default. This is because for a
233 format, but we haven't made it the default. This is because for a
234 long time, the format for unified diffs we usually use has been
234 long time, the format for unified diffs we usually use has been
235 defined by GNU patch, and it doesn't (yet) support git's extensions
235 defined by GNU patch, and it doesn't (yet) support git's extensions
236 to the diff format. This means that, when extracting diffs from a
236 to the diff format. This means that, when extracting diffs from a
237 Mercurial repository (through the diff command, for example), you
237 Mercurial repository (through the diff command, for example), you
General Comments 0
You need to be logged in to leave comments. Login now