make "git merge-tree" a built-in
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2010 02:25:20 +0000 (18:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 04:06:58 +0000 (20:06 -0800)
commit907a7cb...1c6c44d25f4c734a46d5174363190a84
tree4377628...0f02ae63b73763aa666117b6882ee068copy hash to clipboard (tree)
parenta503121...c4fe5f5d3fcf649d10769744cbc66fedcopy hash to clipboard (diff)
Makefile
builtin-merge-tree.c [new file with mode: 0644]
builtin.h
git.c
merge-tree.c [deleted file]