Merge branch 'jc/maint-mergetool-read-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
commitf50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f
tree99cb0e9d99591f00b68eeb540d567aec88565475
parentba9a247bf62a56c354bca640ba0ee131a3347864
parent6b445773b78544032262b897c9aa3b5bd4405dd3
Merge branch 'jc/maint-mergetool-read-fix'

* jc/maint-mergetool-read-fix:
  mergetool: check return value from read