Merge branch 'en/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:35 +0000 (14:11 -0700)
commitac9666f...4a597973ef29dc7f0f7edcb3e1a3aa45
tree8603a21...7eeff8893f88ff58a779e49dc9219e6bcopy hash to clipboard (tree)
parentd98a509...c3e9ff22bb642f778900691d0c715ba9copy hash to clipboard (diff)
parentb9b3eef...6186d423efb684d01b3e99ef010a61decopy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh