Merge branch 'ph/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:42 +0000 (16:22 -0700)
commit5e707b2...d9ea0bebfef5aff977e3ccebd53aa045
tree8662542...0cfe6006a269386770b26936d718a5aecopy hash to clipboard (tree)
parent27158e4...3a1be339ce34c7ee5fb553acaa7e28decopy hash to clipboard (diff)
parent641dba4...bf819dc5f4874a75b206bc7f51dc14e6copy hash to clipboard (diff)