kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileMerge.app on FileView diffs

Browse Source
This commit is contained in:
German Laullon
2011-03-19 13:32:30 -07:00
parent 95cb498e37
commit 1ec2ef2596
6 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/views/diff/diffWindow.js
+8
View File
@@ -9,3 +9,11 @@ var showFile = function(txt) {
$("diff").innerHTML = txt;
$("message").style.display = "none";
}
// TODO: need to be refactoring
var openFileMerge = function(file,sha,sha2) {
alert(file);
alert(sha);
alert(sha2);
Controller.openFileMerge_sha_sha2_(file,sha,sha2);
}