diff options
author | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
commit | 895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch) | |
tree | 49c8602e9cd733e6f6c105e94e614b8236677853 /editors/diff.c | |
parent | 535ec990c50206697852d5c25e94a959f24d86bc (diff) | |
parent | 072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff) | |
download | busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2 busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.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 c3ad31bf3..cf14b1d03 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -363,7 +363,7 @@ static void stone(const int *a, int n, const int *b, int *J, int pref) | |||
363 | } | 363 | } |
364 | 364 | ||
365 | struct line { | 365 | struct line { |
366 | /* 'serial' is not used in the begining, so we reuse it | 366 | /* 'serial' is not used in the beginning, so we reuse it |
367 | * to store line offsets, thus reducing memory pressure | 367 | * to store line offsets, thus reducing memory pressure |
368 | */ | 368 | */ |
369 | union { | 369 | union { |