Commit | Line | Data |
---|---|---|
cd196b66 | 1 | [% |
a35d5d2a | 2 | # In the case of merge commits there will be no diff tree. |
6dac2638 | 3 | IF (diff_tree.size||0) > 0; |
a35d5d2a | 4 | INCLUDE '_diff_tree.tt2'; |
5 | END; | |
6dac2638 | 6 | IF (diff.size||0) > 0; |
a35d5d2a | 7 | INCLUDE '_diff.tt2'; |
8 | ELSE | |
9 | %] | |
189f3b00 | 10 | <p class='msg'> |
a35d5d2a | 11 | [% |
cd196b66 | 12 | IF commit && commit.parents > 1; |
a35d5d2a | 13 | 'Trivial merge'; |
14 | ELSE; | |
15 | 'No differences found'; | |
16 | END; | |
17 | %] | |
189f3b00 | 18 | </p> |
a35d5d2a | 19 | [% END %] |
84f49778 | 20 |