From dbbc7dfafa994fb7673e68965c2e8c8b2c88661f Mon Sep 17 00:00:00 2001 From: German Laullon Date: Tue, 8 Mar 2011 17:40:02 -0800 Subject: [PATCH] correct parameters --- PBWebHistoryController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m index 75d69ce..f782a30 100644 --- a/PBWebHistoryController.m +++ b/PBWebHistoryController.m @@ -226,7 +226,7 @@ - (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]; }