Merge branch 'master' into js/c-merge-recursive
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 01:34:36 +0000 (18:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 01:35:14 +0000 (18:35 -0700)
commiteed94a570e0421175d6b4342c0ac48e03ceedf0b
treef33864f2abffdcb83cbf626b26da34f9cc8d5bab
parent4147d801db66df9b127ffe315601f467aa9d1c48
parent01aaf1f88ddc2b99162c302710339f202996f39b
Merge branch 'master' into js/c-merge-recursive

Adjust to hold_lock_file_for_update() change on the master.
Makefile
builtin-read-tree.c
cache.h
git-rebase.sh
merge-recursive.c
read-cache.c