diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index ebf9064..b4a92a8 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1325,6 +1325,7 @@ static const char *path_path(void *obj) * Diff stat formats which we always compute solely against the first parent. */ #define STAT_FORMAT_MASK (DIFF_FORMAT_NUMSTAT \ + | DIFF_FORMAT_SHORTSTAT \ | DIFF_FORMAT_DIFFSTAT) /* find set of paths that every parent touches */ |