diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:34:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:34:41 -0700 |
| commit | f3c5b39567535a41a371aad8a6affbeea0d4c0b9 (patch) | |
| tree | c83f5d4be58e296f3eb90a4be13782d48e5713ad /builtin-diff-files.c | |
| parent | 647377c4c91064fc5001acddd5357467c0da6ef9 (diff) | |
| parent | 5faf64cd28bf79f0c2939717d2ba117498717059 (diff) | |
| download | git-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.tar.gz git-f3c5b39567535a41a371aad8a6affbeea0d4c0b9.tar.xz | |
Merge branch 'th/diff-extra'
Diffstat (limited to 'builtin-diff-files.c')
| -rw-r--r-- | builtin-diff-files.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index ac13db70f..5d4a5c582 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -47,12 +47,5 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) if (rev.pending.nr || rev.min_age != -1 || rev.max_age != -1) usage(diff_files_usage); - /* - * Backward compatibility wart - "diff-files -s" used to - * defeat the common diff option "-s" which asked for - * DIFF_FORMAT_NO_OUTPUT. - */ - if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT) - rev.diffopt.output_format = DIFF_FORMAT_RAW; return run_diff_files(&rev, silent); } |