Show More
@@ -2089,7 +2089,7 b' def merge(ui, repo, node=None, **opts):' | |||
|
2089 | 2089 | roots, heads = [common.node()], [p2.node()] |
|
2090 | 2090 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2091 | 2091 | for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
|
2092 |
|
|
|
2092 | displayer.show(repo[node]) | |
|
2093 | 2093 | return 0 |
|
2094 | 2094 | |
|
2095 | 2095 | return hg.merge(repo, node, force=opts.get('force')) |
General Comments 0
You need to be logged in to leave comments.
Login now