From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Feb 2010 22:27:55 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~136
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0901d5a2ef80996cf64c8afeaec765e1bc09f795;p=git.git

Merge branch 'maint'

* 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
---

0901d5a2ef80996cf64c8afeaec765e1bc09f795