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

basic FileMerge support

Browse Source
This commit is contained in:
German Laullon
2011-03-04 13:38:55 -08:00
parent a20e570520
commit 8896dc993c
7 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GLFileView.m
+1
View File
@@ -324,6 +324,7 @@
inDiff=TRUE;
NSString *fileName=[self getFileName:line];
[res appendString:[NSString stringWithFormat:@"<table id='%@' class='diff'><thead><tr><td colspan='3'>",fileName]];
[res appendString:[NSString stringWithFormat:@"<div class='filemerge'><a href='' onclick='openFileMerge(\"%@\",\"{SHA}\"); return false;'><img src='GitX://app:/filemerge' width='32' height='32'/><br/>open in<br/>FileMerge</a></div>",fileName]];
[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
}else if(inDiff){
[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];