Mercurial > hg-stable
changeset 8636:7aa1526d4fc5
merge: whitespace cleanup
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Wed, 27 May 2009 16:25:31 +0200 |
| parents | aaaf4af1c173 |
| children | c88c8d59979f |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed May 27 14:11:41 2009 +0200 +++ b/mercurial/commands.py Wed May 27 16:25:31 2009 +0200 @@ -2089,7 +2089,7 @@ 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'))