# HG changeset patch # User Marcin Kuzminski # Date 2013-03-27 17:47:40 # Node ID 6bc4b63bb225e478b2212c90c074c08653c70921 # Parent a8373e8fff510b7021f5b4292acf79086247e879 use merge param in compare link for it to work as expected diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -123,7 +123,7 @@ %endif %endif %if c.rhodecode_db_repo.fork: -
  • ${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}
  • +
  • ${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default', merge=1),class_='compare_request')}
  • %endif
  • ${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}
  • ${h.link_to(_('Search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}