![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Feb 2010 22:27:55 +0000 (14:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Feb 2010 22:27:55 +0000 (14:27 -0800) |
* maint:
am: remove rebase-apply directory before gc
rerere: fix memory leak if rerere images can't be read
Documentation: mention conflict marker size argument (%L) for merge driver
am: remove rebase-apply directory before gc
rerere: fix memory leak if rerere images can't be read
Documentation: mention conflict marker size argument (%L) for merge driver
Trivial merge