Merge branch 'js/mv'

* js/mv:
builtin git-mv: support moving directories
Make git-mv a builtin
Extract helper bits from c-merge-recursive work

diff --cc Makefile
Simple merge

diff --cc git.c
Simple merge