Merge branch 'tc/merge-m-log'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)
commit8642abc...6454a6e09344e27a7797ff08264abe76
treedcdc995...5cb5e53795b7777b85b8030fd1f9fbb4copy hash to clipboard (tree)
parentfd8b005...0d5bcc91c3b5a883f72addc0e51fb38bcopy hash to clipboard (diff)
parentf0ecac2...70bf6b44b89dfa493abd2f544010b1ebcopy hash to clipboard (diff)
builtin.h
builtin/merge.c