Files @ a07296564f6b
Branch filter:

Location: kallithea/rhodecode/tests/fixtures/hg_diff_chmod.diff - annotation

Mads Kiilerich
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.
1
2
3
diff --git a/file b/file
old mode 100755
new mode 100644