diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
| commit | b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch) | |
| tree | da951e1c145cc094a6e5d634141f03b809bf3aff /combine-diff.c | |
| parent | 01b127cdc5d596a3022d834d82f883822c7f166b (diff) | |
| parent | 868d662399786462f87df45c3d68bd5390311a6e (diff) | |
| download | git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.gz git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.xz | |
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index a2e8dcf85..978668036 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -423,7 +423,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt, hunk_begin, j); la = (la + context < cnt + 1) ? (la + context) : cnt + 1; - while (j <= --la) { + while (la && j <= --la) { if (sline[la].flag & mark) { contin = 1; break; |