Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Sep 2011 03:46:48 +0000 (20:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Sep 2011 03:46:48 +0000 (20:46 -0700)
commit5ec8217eb6c89974fda94808a310aa651577b25d
tree81431dd1bc9acd3be5692363c225628e0993f659
parent9b502a371e9bc340a537bb19d9a00750428e1651
parente622f41dcd97861796c7529712170f9eae07dc56
Merge branch 'maint'

* maint:
  git-mergetool: check return value from read
git-mergetool--lib.sh