Merge branch 'da/maint-mergetool-twoway' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
commit38ca63f...c0ef70ba4e41d3b5e347e2c7e7d67fe5
tree0c17b09...f9b08d92787da10a8c68e2f0e80f75c9copy hash to clipboard (tree)
parent2d1abfa...eeeb168bdd5d05302c1a57f30973711ecopy hash to clipboard (diff)
parentec245ba...4944473ba6657a826643ef90ed02b51dcopy hash to clipboard (diff)