{% load i18n %} function get_commit_diff(url, callback) { $.ajax({ url: url, dataType: 'json', cache: false, contentType: 'application/json; charset=utf-8', success: function(data) { var con = ''; var show = function(data_) { con += '
{% trans "No conflict in the merge." %}
'; } callback(con); } }); } function list_commit_change(obj) { var url = obj.attr('href'); get_commit_diff(url, function(content) { var time = '' + obj.attr('data') + '
'; var title = '