Merge branch 'da/mergetool-lib'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700)
commitbbc0995...92880d9f87f5c1a871f5f55b7284c7f1
tree70b605f...2e50d75e7a79f0407287722c1b30ceb2copy hash to clipboard (tree)
parentd34f715...53526bf55f1fa422d56608c32433c8d1copy hash to clipboard (diff)
parent4481ff0...8df4c86021d783de6f099909495f04ffcopy hash to clipboard (diff)