Merge branch 'jc/maint-mergetool-read-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:39 +0000 (21:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:39 +0000 (21:53 -0700)
commitb3038a5...db00a42afed69da31b6a8d85d5e3fad1
treea730e36...3a5dfb0439fb53369e3aac22f1d18579copy hash to clipboard (tree)
parenteff7c32...fd12867000d6449d335fad0e7c9751f1copy hash to clipboard (diff)
parent6b44577...b78544032262b897c9aa3b5bd4405dd3copy hash to clipboard (diff)