![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 23:22:39 +0000 (16:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 23:22:39 +0000 (16:22 -0700) | ||
| commit | 27158e463a1be339ce34c7ee5fb553acaa7e28de | |
| tree | a4ba9d0f81716dcb30e69677e09ef79c0878441d | tree | snapshot |
| parent | d4b76e15ea733002e364298a81889452b8bb2dfd | commit | diff |
| parent | c14b9d1e330a7f68ffd0ad7e22d6148c6097c122 | commit | diff |
Merge branch 'js/apply-recount'
* js/apply-recount:
Allow git-apply to recount the lines in a hunk (AKA recountdiff)
* js/apply-recount:
Allow git-apply to recount the lines in a hunk (AKA recountdiff)
| builtin-apply.c | diff1 | | diff2 | | blob | history |