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]; }