From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jul 2008 09:17:28 +0000 (-0700)
Subject: Merge branch 'jc/rerere'
X-Git-Tag: v1.6.0-rc0~120
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86d72443215612f66f77dfc57ec9613c8153617c?hp=86d72443215612f66f77dfc57ec9613c8153617c

Merge branch 'jc/rerere'

* jc/rerere:
rerere.autoupdate
t4200: fix rerere test
rerere: remove dubious "tail_optimization"
git-rerere: detect unparsable conflicts
rerere: rerere_created_at() and has_resolution() abstraction
---