Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
combine-diff: move formatting logic to show_combined_diff()
[gitweb.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index df6fd97fca04369726e92b54ab54c59f808b4742..b170b03fd34da719b322b49d9718262a625df357 100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-248,7
+248,7
@@
int main(int argc, const char **argv)
continue;
}
if (!strcmp(arg, "-m")) {
- ignore_merges = 0;
+
combine_merges =
ignore_merges = 0;
continue;
}
if (!strcmp(arg, "-c")) {