Merge branch 'en/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:35 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:35 +0000 (17:52 -0800)
commit5acb623...72bde9ec96c48a8bb8f50e61371705ee
tree5d67a3d...0b6e68c5b17ea872ae76ddb66bcdc165copy hash to clipboard (tree)
parent106e3af...6f2d54ea520f9f156abca34913ae4968copy hash to clipboard (diff)
parent9f6cea9...c97ee505bd6771db7df69f04df9b4fc4copy hash to clipboard (diff)
merge-recursive.c
t/t3030-merge-recursive.sh
t/t6020-merge-df.sh
t/t6022-merge-rename.sh
t/t6036-recursive-corner-cases.sh