diff options
author | Ron Yorston <rmy@pobox.com> | 2021-03-01 11:48:04 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-03-01 11:48:04 +0000 |
commit | e2e8e16b465d34759678b8170c44ce62c5b74eb0 (patch) | |
tree | abc31e3e2c1d0de089ae5e1e6d37672394757af9 /editors/diff.c | |
parent | b5cd41cdf4e6afd475fe34b755f99578e20b08ca (diff) | |
parent | 9b6bcfda0e11c0e73a966a77110f6c68425cff34 (diff) | |
download | busybox-w32-e2e8e16b465d34759678b8170c44ce62c5b74eb0.tar.gz busybox-w32-e2e8e16b465d34759678b8170c44ce62c5b74eb0.tar.bz2 busybox-w32-e2e8e16b465d34759678b8170c44ce62c5b74eb0.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r-- | editors/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/diff.c b/editors/diff.c index a1c51ebb9..17d41af8d 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -1076,7 +1076,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv) | |||
1076 | /* diffreg can get non-regular files here */ | 1076 | /* diffreg can get non-regular files here */ |
1077 | print_status(gotstdin > 1 ? STATUS_SAME : diffreg(file), file); | 1077 | print_status(gotstdin > 1 ? STATUS_SAME : diffreg(file), file); |
1078 | 1078 | ||
1079 | if (dirfile) | 1079 | if (ENABLE_FEATURE_CLEAN_UP && dirfile) |
1080 | free(file[dir]); | 1080 | free(file[dir]); |
1081 | } | 1081 | } |
1082 | 1082 | ||