##// END OF EJS Templates
compare: show aggregated diff of what will be merged to other repo, using merge ancestor...
compare: show aggregated diff of what will be merged to other repo, using merge ancestor pull_request.get_compare_data will also now return the ancestor that would be used for actual merging. Showing a diff from that ancestor instead of the first 'new' changeset will give a more realistic diff that doesn't include merges.

File last commit:

r3273:91679a50 beta
r3323:a0729656 beta
Show More
patch_changeset.html
17 lines | 423 B | text/html | HtmlLexer
%if h.is_hg(c.rhodecode_repo):
# ${c.rhodecode_repo.alias.upper()} changeset patch
# User ${c.changeset.author |n}
# Date ${c.changeset.date}
# Node ID ${c.changeset.raw_id}
${c.parent_tmpl}
${c.changeset.message |n}
%elif h.is_git(c.rhodecode_repo):
From ${c.changeset.raw_id} ${c.changeset.date}
From: ${c.changeset.author |n}
Date: ${c.changeset.date}
Subject: [PATCH] ${c.changeset.message |n}
---
%endif
${c.diff|n}