From: Junio C Hamano <junkio@cox.net>
Date: Sun, 24 Dec 2006 10:10:55 +0000 (-0800)
Subject: Merge branch 'js/rerere'
X-Git-Tag: v1.5.0-rc0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9def2138a17325c68961c3b1e6c967d33f28a4f1;p=git.git

Merge branch 'js/rerere'

* js/rerere:
  Make git-rerere a builtin
  Add a test for git-rerere
  move read_mmfile() into xdiff-interface
---

9def2138a17325c68961c3b1e6c967d33f28a4f1