~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt

  • Committer: Launchpad Patch Queue Manager
  • Date: 2012-01-04 03:03:41 UTC
  • mfrom: (14616.1.2 longpoll-stats-903586)
  • Revision ID: launchpad@pqm.canonical.com-20120104030341-os86i70cbyvzdjc5
[r=gmb][bug=903586] Update the stats on a MP page.

Show diffs side-by-side

added added

removed removed

Lines of Context:
136
136
        tal:condition="context/preview_diff">
137
137
      <th>Diff against target:</th>
138
138
      <td>
139
 
        <tal:diff replace="structure context/preview_diff/fmt:link"/>
140
 
        <pre tal:condition="context/preview_diff/has_conflicts"
141
 
             tal:content="context/preview_diff/conflicts"/>
 
139
        <div tal:replace="structure context/@@++diff-stats" />
142
140
      </td>
143
141
    </tr>
144
142
    <tr id="summary-row-merge-instruction">