diff options
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 2 | 
1 files changed, 0 insertions, 2 deletions
@@ -331,8 +331,6 @@ static int cmd_log(int argc, const char **argv, char **envp)  	init_revisions(&rev);  	rev.always_show_header = 1;  	rev.diffopt.recursive = 1; -	rev.combine_merges = 1; -	rev.ignore_merges = 0;  	return cmd_log_wc(argc, argv, envp, &rev);  }  | 
