Merge branch 'js/rerere'

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

diff --cc Makefile
Simple merge

diff --cc git.c
Simple merge