Merge branch 'master' of git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2007 00:29:26 +0000 (17:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2007 00:29:26 +0000 (17:29 -0700)
commite92ea62...25fb89713bc47241af29a79f5f191cc6
treea027f4d...7331623b3a4d99eeea5e14557af990e3copy hash to clipboard (tree)
parent09b0d9d...e03df1432df06dcfcc20d8abecccb860copy hash to clipboard (diff)
parentc80d25d...ce759a8483ffc1f085fdf4cd63cf9f05copy hash to clipboard (diff)
git-gui/git-gui.sh
git-gui/lib/class.tcl
git-gui/lib/merge.tcl