Merge branch 'sp/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700)
commit6959893...0b65ebc68ce2fb524a8ec15a26ca4972
treea499f6b...a7309306f667b3cbded1a1bcf1ff35decopy hash to clipboard (tree)
parent452b800...8235040461dae01933270c6668741b64copy hash to clipboard (diff)
parentd279fc1...76bf9bfeedded1a1c8ebcfc8779f5b10copy hash to clipboard (diff)