Merge branch 'refs/heads/FileMerge_on_diffs'

laullon · laullon · commit d78d075d7b9f · 2011-03-08T17:43:29.000-08:00
diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
@@ -226,7 +226,7 @@ - (void)selectCommit:(NSString *)sha
 
 - (void) openFileMerge:(NSString*)file sha:(NSString *)sha
 {
-	NSArray *args=[NSArray arrayWithObjects:@"difftool",@"--no-prompt",@"--tool=opendiff",[NSString stringWithFormat:@"%@^",sha],sha,file,nil];
+	NSArray *args=[NSArray arrayWithObjects:@"difftool",@"--no-prompt",@"--tool=opendiff",[NSString stringWithFormat:@"%@^",sha],sha,@"--",file,nil];
 	[historyController.repository handleForArguments:args];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ - (void)selectCommit:(NSString *)sha`
`226`	`226`
`227`	`227`	`- (void) openFileMerge:(NSString)file sha:(NSString )sha`
`228`	`228`	`{`
`229`		`- NSArray *args=[NSArray arrayWithObjects:@"difftool",@"--no-prompt",@"--tool=opendiff",[NSString stringWithFormat:@"%@^",sha],sha,file,nil];`
	`229`	`+ NSArray *args=[NSArray arrayWithObjects:@"difftool",@"--no-prompt",@"--tool=opendiff",[NSString stringWithFormat:@"%@^",sha],sha,@"--",file,nil];`
`230`	`230`	`[historyController.repository handleForArguments:args];`
`231`	`231`	`}`
`232`	`232`