Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
commit8280baf...65e1c72adaa6d2dfef70d18837126898
tree150aed0...0d12803bc306c5d77d59ae135faa14b5copy hash to clipboard (tree)
parent58f75bc...323e86067147ac66bbb493e6a8c2631fcopy hash to clipboard (diff)
parent8528445...1e8daaa6689cab48a725f764ad5779cbcopy hash to clipboard (diff)