diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-29 01:33:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-29 01:33:16 -0700 |
| commit | a0c5081a78bef2167d9663fe0847b757a6a797f5 (patch) | |
| tree | 0ab7a492faa0ddbfffe588c7bdcfe26e81f3a475 /revision.c | |
| parent | Merge branch 'np/delta' into next (diff) | |
| parent | built-in diff: assorted updates. (diff) | |
| download | tgif-a0c5081a78bef2167d9663fe0847b757a6a797f5.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
built-in diff: assorted updates.
built-in diff.
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c index b6ed0149a5..3545df6119 100644 --- a/revision.c +++ b/revision.c @@ -664,6 +664,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch } if (!strcmp(arg, "-c")) { revs->diff = 1; + revs->dense_combined_merges = 0; revs->combine_merges = 1; continue; } |