Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
binary diff: further updates.
[gitweb.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index c6e8702f380ccb9be914ae7608e9f6c3ec77d796..f8ee38e54d52661cf91842e9f2fd14f74983a5d6 100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-694,6
+694,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;
}