← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/templates/branchmergeproposal-diff-stats.pt

  • Committer: Raphael Badin
  • Date: 2012-01-06 08:27:55 UTC
  • mfrom: (14513.5.4 builder-history-lfa)
  • mto: This revision was merged to the branch mainline in revision 14654.
  • Revision ID: raphael.badin@canonical.com-20120106082755-95a0eh6nakv5hj3b
Merge devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/templates/branchmergeproposal-diff-stats.pt
 
1
<tal:root
 
2
  xmlns:tal="http://xml.zope.org/namespaces/tal"
 
3
>
 
4
  <tal:diff replace="structure view/preview_diff/fmt:link"/>
 
5
  <pre tal:condition="view/preview_diff/has_conflicts"
 
6
       tal:content="view/preview_diff/conflicts"/>
 
7
</tal:root>