![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Jul 2009 04:56:46 +0000 (21:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Jul 2009 04:56:46 +0000 (21:56 -0700) | ||
| commit | 248b6c0609cf7cc9411a9094c4868ce9cdbd4922 | |
| tree | 6c262ee8bde6bac1dbb804aa98275569413a8780 | tree | snapshot |
| parent | 2a679c7a3148978a3f58f1c12100383638e744c5 | commit | diff |
| parent | 735c674416b87505400fcf738fd3a38b52f0eccb | commit | diff |
Merge branch 'maint'
* maint:
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines
* maint:
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines
| combine-diff.c | diff1 | | diff2 | | blob | history |