diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 10:05:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 10:05:12 +0100 |
| commit | 5d921e2931e5041884d8f86fdccc9004a7b071cc (patch) | |
| tree | deedbb6c40af5a3cceedf01ce0f315217a39fa16 /t/t3200-branch.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | expose a helper function peel_to_type(). (diff) | |
| download | git-5d921e2931e5041884d8f86fdccc9004a7b071cc.tar.xz git-5d921e2931e5041884d8f86fdccc9004a7b071cc.zip | |
Merge branch 'jc/cherry-pick' (early part)
* '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
Diffstat (limited to 't/t3200-branch.sh')
0 files changed, 0 insertions, 0 deletions