Andrew's git / gitweb.git / diff
?
Merge branch 'jc/cherry-pick' (early part)
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 09:05:12 +0000 (02:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 09:05:12 +0000 (02:05 -0700)
* 'jc/cherry-pick' (early part):
expose a helper function peel_to_type().
merge-recursive: split low-level merge functions out.

Conflicts:

Makefile
builtin-merge-recursive.c
sha1_name.c

No differences found