Show More
| @@ -1846,7 +1846,7 b' def update(repo, node, branchmerge, forc' | |||
|
|
1846 | 1846 | else: |
|
|
1847 | 1847 | pas = [p1.ancestor(p2, warn=branchmerge)] |
|
|
1848 | 1848 | |
|
|
1849 |
fp1, fp2, xp1, xp2 = p1.node(), p2.node(), |
|
|
|
1849 | fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2) | |
|
|
1850 | 1850 | |
|
|
1851 | 1851 | ### check phase |
|
|
1852 | 1852 | if not overwrite: |
General Comments 0
You need to be logged in to leave comments.
Login now