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)
commit5ec8217...b6c89974fda94808a310aa651577b25d
tree81431dd...bc9acd3be5692363c225628e0993f659copy hash to clipboard (tree)
parent9b502a3...1e9bc340a537bb19d9a00750428e1651copy hash to clipboard (diff)
parente622f41...cd97861796c7529712170f9eae07dc56copy hash to clipboard (diff)
git-mergetool--lib.sh