diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
commit | 5f6f2162512106adf120d4b528bb125e93e34429 (patch) | |
tree | 7d7449f755633c263be7125ad58d21cc3ca5b8a7 /editors/diff.c | |
parent | 9db69882bee2d528d706d61d34ef7741122330be (diff) | |
parent | a116552869db5e7793ae10968eb3c962c69b3d8c (diff) | |
download | busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2 busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip |
Merge remote-tracking branch 'upstream/master'
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 d9d709db6..cc7ba472e 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -230,7 +230,7 @@ static int search(const int *c, int k, int y, const struct cand *list) | |||
230 | { | 230 | { |
231 | int i, j; | 231 | int i, j; |
232 | 232 | ||
233 | if (list[c[k]].y < y) /* quick look for typical case */ | 233 | if (list[c[k]].y < y) /* quick look for typical case */ |
234 | return k + 1; | 234 | return k + 1; |
235 | 235 | ||
236 | for (i = 0, j = k + 1;;) { | 236 | for (i = 0, j = k + 1;;) { |