Merge git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
commit547905f...cd2a04b3e1117f00025b60f81aa60f47
tree9e9421e...97a9caecc6f16c3afd6a1b77abacabb9copy hash to clipboard (tree)
parentebcffb1...44643bab69671abdf79209489e64dbefcopy hash to clipboard (diff)
parentf049e09...4d32715ee8893d290d1c52888216fbe4copy hash to clipboard (diff)
git-gui/git-gui.sh
git-gui/lib/merge.tcl