facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

merge: whitespace cleanup

Browse Source
This commit is contained in:
Peter Arrenbrecht 2009-05-27 16:25:31 +02:00
parent 38e7748fe0
commit 7faf52b00f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/commands.py
View File

@ -2089,7 +2089,7 @@ def merge(ui, repo, node=None, **opts):
roots, heads = [common.node()], [p2.node()]
displayer = cmdutil.show_changeset(ui, repo, opts)
for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
displayer.show(repo[node])
displayer.show(repo[node])
return 0
return hg.merge(repo, node, force=opts.get('force'))